X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=configure.ac;h=9923d88809186c3e1ad3e9f8f2a86874f6567d7a;hb=f388fe135bbf3838e790c2b17e9a52512bb67be1;hp=d9d1cd48252cebdfbfe877caa88d0d418a1ffc98;hpb=15d1646b2048caffbfaf2b7562665d38afe92688;p=awesomized%2Flibmemcached diff --git a/configure.ac b/configure.ac index d9d1cd48..9923d888 100644 --- a/configure.ac +++ b/configure.ac @@ -6,7 +6,7 @@ # Use and distribution licensed under the BSD license. See # the COPYING file in this directory for full text. -AC_INIT([libmemcached],[1.0.14],[http://libmemcached.org/]) +AC_INIT([libmemcached],[1.0.16],[http://libmemcached.org/]) AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_MACRO_DIR([m4]) @@ -19,6 +19,7 @@ AM_INIT_AUTOMAKE([1.11 color-tests -Wno-portability subdir-objects foreign tar-u AC_PREREQ([2.61]) AC_CONFIG_HEADERS([mem_config.h:mem_config.in])dnl Keep filename to 8.3 for MS-DOS. +AC_SUBST([AUTOHEADER_FILE],[mem_config.h]) AC_CONFIG_SRCDIR([libmemcached/memcached.cc]) #shared library versioning @@ -47,6 +48,7 @@ m4_include([libhashkit/include.m4]) LT_PREREQ([2.2]) LT_INIT LT_LANG([C++]) +LT_LIB_M AX_ASSERT @@ -55,9 +57,8 @@ AX_PLATFORM m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])]) AX_CXX_HEADER_STDCXX_98 -AS_IF([ test "$ax_cv_cxx_stdcxx_98" = no ],[ - AC_MSG_ERROR([Your system lacks a new enough C++ compiler]) - ]) +AS_IF([test "x$ax_cv_cxx_stdcxx_98" = "xno"], + [AC_MSG_ERROR([Your system lacks a new enough C++ compiler])]) AC_DEFUN([LIBMEMCACHED_PROTOCOL], [AC_ARG_ENABLE([libmemcachedprotocol], @@ -76,18 +77,17 @@ LIBMEMCACHED_PROTOCOL # Adding support for libtest m4_include([libtest/yatl.m4]) -m4_include([m4/memcached_sasl.m4]) -m4_include([m4/gearmand.m4]) -m4_include([m4/libgearman.m4]) +CHECK_FOR_GEARMAND +CHECK_FOR_LIBGEARMAND -AM_CONDITIONAL([BUILDING_LIBMEMCACHED], [true]) -AM_CONDITIONAL([HAVE_LIBMEMCACHED], [false]) -AM_CONDITIONAL([HAVE_LIBDRIZZLE], [false]) -AC_DEFINE([HAVE_LIBMEMCACHED], [1], [Enables libmemcached Support]) +AM_CONDITIONAL([BUILDING_LIBMEMCACHED],[true]) +AM_CONDITIONAL([HAVE_LIBMEMCACHED],[false]) +AM_CONDITIONAL([HAVE_LIBDRIZZLE],[false]) +AC_DEFINE([HAVE_LIBMEMCACHED],[1],[Enables libmemcached Support]) -AM_CONDITIONAL([BUILDING_GEARMAN], [false]) +AM_CONDITIONAL([BUILDING_GEARMAN],[false]) -dnl Specialty checks +# Specialty checks AX_CXX_CINTTYPES CONFIG_EXTRA DETECT_BYTEORDER @@ -100,65 +100,80 @@ PROTOCOL_BINARY_TEST ENABLE_DEPRECATED # Checks for programs. -AC_CHECK_PROGS([LEX], ['flex'], [:]) -AC_CHECK_PROGS([YACC], ['bison'], [:]) +AC_CHECK_PROGS([LEX],['flex'],[:]) +AC_CHECK_PROGS([YACC],['bison'],[:]) AX_PROG_SPHINX_BUILD # Checks for libraries. -AC_SEARCH_LIBS(getopt_long, gnugetopt) -AC_SEARCH_LIBS(gethostbyname, nsl) +AC_SEARCH_LIBS([getopt_long],[gnugetopt]) +AC_SEARCH_LIBS([gethostbyname],[nsl]) # Checks for header files. -AC_CHECK_HEADERS([arpa/inet.h]) -AC_CHECK_HEADERS([errno.h]) -AC_CHECK_HEADERS([dlfcn.h]) -AC_CHECK_HEADERS([execinfo.h]) -AC_CHECK_HEADERS([fcntl.h]) -AC_CHECK_HEADERS([inttypes.h]) -AC_CHECK_HEADERS([libintl.h]) -AC_CHECK_HEADERS([limits.h]) -AC_CHECK_HEADERS([math.h]) -AC_CHECK_HEADERS([netdb.h]) -AC_CHECK_HEADERS([netinet/in.h]) -AC_CHECK_HEADERS([netinet/tcp.h]) -AC_CHECK_HEADERS([pthread.h]) -AC_CHECK_HEADERS([spawn.h]) -AC_CHECK_HEADERS([stdarg.h]) -AC_CHECK_HEADERS([stddef.h]) -AC_CHECK_HEADERS([stdio.h]) -AC_CHECK_HEADERS([stdlib.h]) -AC_CHECK_HEADERS([sys/socket.h]) -AC_CHECK_HEADERS([sys/sysctl.h]) -AC_CHECK_HEADERS([sys/time.h]) -AC_CHECK_HEADERS([sys/un.h]) -AC_CHECK_HEADERS([time.h]) -AC_CHECK_HEADERS([unistd.h]) +AC_CHECK_HEADERS_ONCE([arpa/inet.h]) +AC_CHECK_HEADERS_ONCE([errno.h]) +AC_CHECK_HEADERS_ONCE([execinfo.h]) +AC_CHECK_HEADERS_ONCE([fcntl.h]) +AC_CHECK_HEADERS_ONCE([features.h]) +AC_CHECK_HEADERS_ONCE([fnmatch.h]) +AC_CHECK_HEADERS_ONCE([inttypes.h]) +AC_CHECK_HEADERS_ONCE([libintl.h]) +AC_CHECK_HEADERS_ONCE([limits.h]) +AC_CHECK_HEADERS_ONCE([mach/mach.h]) +AC_CHECK_HEADERS_ONCE([malloc.h]) +AC_CHECK_HEADERS_ONCE([math.h]) +AC_CHECK_HEADERS_ONCE([netdb.h]) +AC_CHECK_HEADERS_ONCE([netinet/in.h]) +AC_CHECK_HEADERS_ONCE([netinet/tcp.h]) +AC_CHECK_HEADERS_ONCE([poll.h]) +AC_CHECK_HEADERS_ONCE([pthread.h]) +AC_CHECK_HEADERS_ONCE([spawn.h]) +AC_CHECK_HEADERS_ONCE([stdarg.h]) +AC_CHECK_HEADERS_ONCE([stddef.h]) +AC_CHECK_HEADERS_ONCE([stdio.h]) +AC_CHECK_HEADERS_ONCE([stdlib.h]) +AC_CHECK_HEADERS_ONCE([sys/socket.h]) +AC_CHECK_HEADERS_ONCE([sys/sysctl.h]) +AC_CHECK_HEADERS_ONCE([sys/time.h]) +AC_CHECK_HEADERS_ONCE([sys/types.h]) +AC_CHECK_HEADERS_ONCE([sys/un.h]) +AC_CHECK_HEADERS_ONCE([sys/wait.h]) +AC_CHECK_HEADERS_ONCE([syslog.h]) +AC_CHECK_HEADERS_ONCE([time.h]) +AC_CHECK_HEADERS_ONCE([unistd.h]) # Windows only -AC_CHECK_HEADERS([winsock2.h]) -AC_CHECK_HEADERS([ws2tcpip.h]) +AC_CHECK_HEADERS_ONCE([winsock2.h]) +AC_CHECK_HEADERS_ONCE([ws2tcpip.h]) # Checks for typedefs, structures, and compiler characteristics. # Checks for library functions. AC_CHECK_FUNCS([alarm]) +AC_CHECK_FUNCS([atexit]) +AC_CHECK_FUNCS([clock_gettime]) AC_CHECK_FUNCS([dup2]) AC_CHECK_FUNCS([fcntl]) +AC_CHECK_FUNCS([floor]) +AC_CHECK_FUNCS([getcwd]) AC_CHECK_FUNCS([getline]) AC_CHECK_FUNCS([gettimeofday]) +AC_CHECK_FUNCS([inet_ntoa]) AC_CHECK_FUNCS([memchr]) AC_CHECK_FUNCS([memmove]) AC_CHECK_FUNCS([memset]) AC_CHECK_FUNCS([pipe2]) +AC_CHECK_FUNCS([putenv]) AC_CHECK_FUNCS([select]) AC_CHECK_FUNCS([setenv]) +AC_CHECK_FUNCS([sigignore]) AC_CHECK_FUNCS([socket]) AC_CHECK_FUNCS([sqrt]) AC_CHECK_FUNCS([strcasecmp]) AC_CHECK_FUNCS([strchr]) AC_CHECK_FUNCS([strdup]) AC_CHECK_FUNCS([strerror]) +AC_CHECK_FUNCS([strstr]) AC_CHECK_FUNCS([strtol]) AC_CHECK_FUNCS([strtoul]) AC_CHECK_FUNCS([strtoull]) @@ -167,16 +182,26 @@ AC_FUNC_ERROR_AT_LINE AC_FUNC_FORK AC_FUNC_STRERROR_R -AC_CHECK_HEADER([umem.h], [ - AC_DEFINE([HAVE_UMEM_H], 1, - [Define this if you have umem.h]) - build_cache=no -], [build_cache=yes]) +AC_CHECK_HEADER([umem.h], + [AC_DEFINE([HAVE_UMEM_H],[1],[Define this if you have umem.h]) + build_cache=no], + [build_cache=yes]) -AM_CONDITIONAL([BUILD_CACHE], [test "x$build_cache" = "xyes"]) +AM_CONDITIONAL([BUILD_CACHE],[test "x$build_cache" = "xyes"]) AX_COMPILER_VENDOR +AC_CHECK_TYPES([in_port_t],,,[[ + #ifdef HAVE_SYS_TYPES_H + # include + #endif + #ifdef HAVE_NETINET_IN_H + # include + #endif + #ifdef HAVE_NETDB_H + # include + #endif]]) +AC_CHECK_TYPES([ptrdiff_t]) AC_HEADER_STDBOOL AC_TYPE_INT16_T AC_TYPE_INT32_T @@ -198,59 +223,37 @@ AC_C_RESTRICT AX_CXX_GCC_ABI_DEMANGLE -AX_SASL_CHECK AX_LIBEVENT -dnl -dnl The sasl functions should only be visible if we build with sasl support -dnl -AS_IF([test "x$ac_enable_sasl" = "xyes"], [ - [ LIBMEMCACHED_WITH_SASL_SUPPORT="#define LIBMEMCACHED_WITH_SASL_SUPPORT 1" ] - ],[ LIBMEMCACHED_WITH_SASL_SUPPORT="#define LIBMEMCACHED_WITH_SASL_SUPPORT 0" ]) -AC_SUBST(LIBMEMCACHED_WITH_SASL_SUPPORT) - -AC_CHECK_LIB([rt],[clock_gettime], [ - RT_LIB="-lrt" - AC_SUBST(RT_LIB) - AC_DEFINE([HAVE_CLOCK_GETTIME], [ 1 ], [Have clock_gettime]) - ],[ - AC_DEFINE([HAVE_CLOCK_GETTIME], [ 0 ], [Have clock_gettime]) - ]) - -# Check for the ability to call dlopen -AC_CHECK_LIB([dl],[dlopen], [ - DL_LIB="-ldl" - AC_SUBST([DL_LIB]) - AC_DEFINE([HAVE_LIBDL],[1],[Have dlopen]) - ],[ - AC_DEFINE([HAVE_LIBDL], [0], [Have dlopen]) - ]) +AC_CHECK_LIB([rt],[clock_gettime], + [AC_SUBST([RT_LIB],[-lrt]) + AC_DEFINE([HAVE_CLOCK_GETTIME],[1],[Have clock_gettime])], + [AC_DEFINE([HAVE_CLOCK_GETTIME],[0],[Have clock_gettime])]) -AC_CHECK_LIB([m],[floor]) -AC_CHECK_FUNCS([sigignore]) + +# Check for the ability to call dlopen (used in libhostile) +AX_DLOPEN AC_CHECK_HEADERS([atomic.h]) -AS_IF([test "x$ac_cv_header_atomic_h" = "xyes"],[ - AC_CHECK_FUNCS([atomic_add_64]) +AS_IF([test "x$ac_cv_header_atomic_h" = "xyes"], + [AC_CHECK_FUNCS([atomic_add_64]) AC_CHECK_FUNCS([atomic_add_32]) - AS_IF([test "x$ac_cv_func_atomic_add_64" = "xyes" -a "x$ac_cv_func_atomic_add_32" = "xyes"],[ - AC_DEFINE([USE_ATOMIC_H], - [1], - [Define to true if you want to use functions from atomic.h])])]) - -AC_DEFINE([HAVE_LIBDRIZZLE], [0], [Support for libdrizzle]) -AC_DEFINE([HAVE_DRIZZLED_BINARY], [0], [Support for DrizzleD]) -AC_DEFINE([DRIZZLED_BINARY], [0], [Support for DrizzleD]) -AC_DEFINE([GEARMAND_BLOBSLAP_WORKER], [0], [Support for Gearman Blobslap worker]) -AC_DEFINE([HAVE_LIBPQ], [0], [Support for Postgres]) -AC_DEFINE([HAVE_LIBCURL], [0], [Support for libcurl]) - -dnl Check for the requirements for running memcached with less privileges -dnl than the default privilege set. On Solaris we need setppriv and priv.h -dnl If you want to add support for other platforms you should check for -dnl your requirements, define HAVE_DROP_PRIVILEGES, and make sure you add -dnl the source file containing the implementation into memcached_SOURCE -dnl in Makefile.am + AS_IF([test "x$ac_cv_func_atomic_add_64" = "xyes" -a "x$ac_cv_func_atomic_add_32" = "xyes"], + [AC_DEFINE([USE_ATOMIC_H],[1],[Define to true if you want to use functions from atomic.h])])]) + +AC_DEFINE([HAVE_LIBDRIZZLE],[0],[Support for libdrizzle]) +AC_DEFINE([HAVE_DRIZZLED_BINARY],[0],[Support for DrizzleD]) +AC_DEFINE([DRIZZLED_BINARY],[0],[Support for DrizzleD]) +AC_DEFINE([GEARMAND_BLOBSLAP_WORKER],[0],[Support for Gearman Blobslap worker]) +AC_DEFINE([HAVE_LIBPQ],[0],[Support for Postgres]) +AC_DEFINE([HAVE_LIBCURL],[0],[Support for libcurl]) + +# Check for the requirements for running memcached with less privileges +# than the default privilege set. On Solaris we need setppriv and priv.h +# If you want to add support for other platforms you should check for +# your requirements, define HAVE_DROP_PRIVILEGES, and make sure you add +# the source file containing the implementation into memcached_SOURCE +# in Makefile.am AC_CHECK_FUNCS([setppriv], [AC_CHECK_HEADER([priv.h], [AC_DEFINE([HAVE_DROP_PRIVILEGES], @@ -259,37 +262,51 @@ AC_CHECK_FUNCS([setppriv], build_solaris_privs=yes]) ]) -AC_CHECK_HEADERS_ONCE([winsock2.h poll.h sys/wait.h fnmatch.h]) AM_CONDITIONAL([BUILD_POLL],[test "x$ac_cv_header_poll_h" = "xno"]) AM_CONDITIONAL([BUILD_WIN32_WRAPPERS],[test "x$ac_cv_header_winsock2_h" = "xyes"]) -AS_IF(test "x$ac_cv_header_winsock2_h" = "xyes", +AS_IF([test "x$ac_cv_header_winsock2_h" = "xyes"], [AM_LDFLAGS="$AM_LDFLAGS -lws2_32" AM_CFLAGS="$AM_CFLAGS $NO_WERROR" AM_CXXFLAGS="$AM_CXXFLAGS $NO_WERROR" - ]) + ]) SOCKET_SEND_FLAGS AX_UUID_GENERATE_TIME_SAFE +AC_DEFUN([CHECK_FOR_PTHREAD_AND_SASL], + [AX_PTHREAD(, [AC_MSG_ERROR([could not find libpthread])]) + AX_PTHREAD_TIMEDJOIN_NP + + # The sasl functions should only be visible if we build with sasl support + # + AX_SASL_OPTION + AS_IF([test "x$ac_enable_sasl" = xyes], + [LIBMEMCACHED_WITH_SASL_SUPPORT="#define LIBMEMCACHED_WITH_SASL_SUPPORT 1"], + [LIBMEMCACHED_WITH_SASL_SUPPORT="#define LIBMEMCACHED_WITH_SASL_SUPPORT 0"]) + AC_SUBST([LIBMEMCACHED_WITH_SASL_SUPPORT]) + ]) +CHECK_FOR_PTHREAD_AND_SASL + -AX_PTHREAD(, [AC_MSG_ERROR([could not find libpthread])]) -AX_PTHREAD_TIMEDJOIN_NP +# backtrace(), others require shared builds +AS_IF([test "x$enable_shared" = "xyes"], + [AC_DEFINE([HAVE_SHARED_ENABLED],[1],[Enable code which requires shared library support. Like backtrace().])]) +AM_CONDITIONAL([SHARED_ENABLED],[test "x$enable_shared" = "xyes"]) PANDORA_ENABLE_DTRACE +HAVE_GCC_ATOMICS AX_ENDIAN AX_ASSERT -AX_CXX_COMPILER_VERSION AX_HARDEN_COMPILER_FLAGS AX_AM_JOBSERVER([yes]) -AC_CONFIG_FILES([ - Makefile - docs/conf.py - libmemcached-1.0/configure.h - support/libmemcached.pc - support/libmemcached.spec - ]) +AC_CONFIG_FILES([Makefile + docs/conf.py + libmemcached-1.0/configure.h + support/libmemcached.pc + support/libmemcached.spec + ]) AC_OUTPUT echo "---" @@ -306,6 +323,7 @@ echo " * CPP Flags: $CPPFLAGS" echo " * LIB Flags: $LIB" echo " * Assertions enabled: $ax_enable_assert" echo " * Debug enabled: $ax_enable_debug" +echo " * Shared: $enable_shared" echo " * Warnings as failure: $ac_cv_warnings_as_errors" echo " * SASL support: $ac_enable_sasl" echo " * make -j: $enable_jobserver"