1
0
Fork 0

paths and flex check

This commit is contained in:
Frank Celler 2012-01-04 16:48:32 +01:00
parent 236dfce9e8
commit d41bb2c1ce
4 changed files with 67 additions and 95 deletions

View File

@ -1,105 +1,77 @@
/* BasicsC/local-configuration.h.in. Generated from configure.ac by autoheader. */
////////////////////////////////////////////////////////////////////////////////
/// @brief High-Performance Database Framework made by triagens
///
/// @file
///
/// DISCLAIMER
///
/// Copyright 2004-2012 triagens GmbH, Cologne, Germany
///
/// Licensed under the Apache License, Version 2.0 (the "License");
/// you may not use this file except in compliance with the License.
/// You may obtain a copy of the License at
///
/// http://www.apache.org/licenses/LICENSE-2.0
///
/// Unless required by applicable law or agreed to in writing, software
/// distributed under the License is distributed on an "AS IS" BASIS,
/// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
/// See the License for the specific language governing permissions and
/// limitations under the License.
///
/// Copyright holder is triAGENS GmbH, Cologne, Germany
///
/// @author Dr. Frank Celler
/// @author Copyright 2011-2012, triAGENS GmbH, Cologne, Germany
////////////////////////////////////////////////////////////////////////////////
/* static programs have broken cxa_guard */
#undef BROKEN_CXA_GUARD
#ifndef TRIAGENS_BASICS_CONFIGURATION_H
#define TRIAGENS_BASICS_CONFIGURATION_H 1
/* define if the Boost library is available */
#undef HAVE_BOOST
#ifndef TRI_WITHIN_COMMON
#error use <BasicsC/common.h>
#endif
/* Define to 1 if you have the <ev.h> header file. */
#undef HAVE_EV_H
// -----------------------------------------------------------------------------
// --SECTION-- Special Configuration Options
// -----------------------------------------------------------------------------
/* Define to 1 if you have the <inttypes.h> header file. */
#undef HAVE_INTTYPES_H
////////////////////////////////////////////////////////////////////////////////
/// @addtogroup Configuration
/// @{
////////////////////////////////////////////////////////////////////////////////
/* Define to 1 if you have the <memory.h> header file. */
#undef HAVE_MEMORY_H
////////////////////////////////////////////////////////////////////////////////
/// @brief enable calculation of timing figures
////////////////////////////////////////////////////////////////////////////////
/* Define to 1 if you have the <openssl/ssl.h> header file. */
#undef HAVE_OPENSSL_SSL_H
/* Define if you have POSIX threads libraries and header files. */
#undef HAVE_PTHREAD
/* Define to 1 if you have the <readline/readline.h> header file. */
#undef HAVE_READLINE_READLINE_H
/* Define to 1 if you have the <stdint.h> header file. */
#undef HAVE_STDINT_H
/* Define to 1 if you have the <stdlib.h> header file. */
#undef HAVE_STDLIB_H
/* Define to 1 if you have the <strings.h> header file. */
#undef HAVE_STRINGS_H
/* Define to 1 if you have the <string.h> header file. */
#undef HAVE_STRING_H
/* Define to 1 if you have the <sys/stat.h> header file. */
#undef HAVE_SYS_STAT_H
/* Define to 1 if you have the <sys/types.h> header file. */
#undef HAVE_SYS_TYPES_H
/* Define to 1 if you have the <unistd.h> header file. */
#undef HAVE_UNISTD_H
/* Define to 1 if your C compiler doesn't accept -c and -o together. */
#undef NO_MINUS_C_MINUS_O
/* true if SSLv23_method return SSL_METHOD const* */
#undef OPENSSL_NEEDS_CONST
/* Name of package */
#undef PACKAGE
/* Define to the address where bug reports for this package should be sent. */
#undef PACKAGE_BUGREPORT
/* Define to the full name of this package. */
#undef PACKAGE_NAME
/* Define to the full name and version of this package. */
#undef PACKAGE_STRING
/* Define to the one symbol short name of this package. */
#undef PACKAGE_TARNAME
/* Define to the home page for this package. */
#undef PACKAGE_URL
/* Define to the version of this package. */
#undef PACKAGE_VERSION
/* Define to necessary symbol if this constant uses a non-standard name on
your system. */
#undef PTHREAD_CREATE_JOINABLE
/* Define to 1 if you have the ANSI C header files. */
#undef STDC_HEADERS
/* true if figures are enabled */
#undef TRI_ENABLE_FIGURES
/* true if logging is enabled */
////////////////////////////////////////////////////////////////////////////////
/// @brief enable logging
////////////////////////////////////////////////////////////////////////////////
#undef TRI_ENABLE_LOGGER
/* true if timing is enabled */
////////////////////////////////////////////////////////////////////////////////
/// @brief enable logging of timings
////////////////////////////////////////////////////////////////////////////////
#undef TRI_ENABLE_LOGGER_TIMING
/* true if timing is enabled */
////////////////////////////////////////////////////////////////////////////////
/// @brief enable timings
////////////////////////////////////////////////////////////////////////////////
#undef TRI_ENABLE_TIMING
/* Version number of package */
#undef VERSION
////////////////////////////////////////////////////////////////////////////////
/// @}
////////////////////////////////////////////////////////////////////////////////
/* Define to 1 if `lex' declares `yytext' as a `char *' by default, not a
`char[]'. */
#undef YYTEXT_POINTER
#endif
/* Number of bits in a file offset, on hosts where this is settable. */
#undef _FILE_OFFSET_BITS
/* Define for large files, on AIX-style hosts. */
#undef _LARGE_FILES
// Local Variables:
// mode: outline-minor
// outline-regexp: "^\\(/// @brief\\|/// {@inheritDoc}\\|/// @addtogroup\\|// --SECTION--\\|/// @\\}\\)"
// End:

View File

@ -26,7 +26,7 @@
/// @author Copyright 2010-2011, triAGENS GmbH, Cologne, Germany
////////////////////////////////////////////////////////////////////////////////
#include <Basics/StringUtils.h>
#include "Basics/StringUtils.h"
#include <cstdlib>
#include <errno.h>
@ -34,8 +34,8 @@
#include <string>
#include "JsonParserXDriver.h"
#include "JsonParserX.h"
#include "JsonParserX/JsonParserXDriver.h"
#include "JsonParserX/JsonParserX.h"
using namespace triagens::basics;
using namespace triagens::rest;

View File

@ -1 +1 @@
#define TRIAGENS_VERSION "0.0.8 [1105:1106M]"
#define TRIAGENS_VERSION "0.0.8 [1105:1107M]"

View File

@ -21,7 +21,7 @@ if test "x$LEX" != x -a "x$LEX" != "x:"; then
fi
if test "x$tr_flex_usable" != "xyes"; then
AC_MSG_WARN([Please install flex version 2.5.35 or higher from http://ftp.gnu.org/gnu/flex/])
AC_MSG_ERROR([Please install flex version 2.5.35 or higher from http://ftp.gnu.org/gnu/flex/])
fi
AM_CONDITIONAL(ENABLE_FLEX, test "x$tr_flex_usable" = xyes)
@ -47,7 +47,7 @@ if test "x$BISON" != x -a "x$BISON" != "x:"; then
fi
if test "x$tr_bison_usable" != "xyes"; then
AC_MSG_WARN([Please install bison version 2.4.1 or higher from http://ftp.gnu.org/gnu/bison/])
AC_MSG_ERROR([Please install bison version 2.4.1 or higher from http://ftp.gnu.org/gnu/bison/])
fi
AM_CONDITIONAL(ENABLE_BISON, test "x$tr_bison_usable" = xyes)