X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=configure.ac;h=1fe4f7749b29d97cf7e9431a54390fd91c8111be;hb=eea484eea39c998d17b14a005a553fd229f5770d;hp=a71e3369c23bf5e537edb5c57cf999a4e25d3c2c;hpb=ee71b673a9ce3261cd81723262a8516949388be9;p=m6w6%2Flibmemcached diff --git a/configure.ac b/configure.ac index a71e3369..1fe4f774 100644 --- a/configure.ac +++ b/configure.ac @@ -1,13 +1,13 @@ #!/usr/bin/env bash # LibmemcacheD -# Copyright (C) 2011 Data Differential, http://datadifferential.com/ +# Copyright (C) 2011-2012 Data Differential, http://datadifferential.com/ # Copyright (C) 2006-2010 Brian Aker, Monty Taylor, Trond Norbye # All rights reserved. # # Use and distribution licensed under the BSD license. See # the COPYING file in this directory for full text. -AC_INIT([libmemcached],[0.52],[http://libmemcached.org/]) +AC_INIT([libmemcached],[1.0.4],[http://libmemcached.org/]) AC_CONFIG_AUX_DIR(config) @@ -33,7 +33,7 @@ AC_CHECK_PROGS([LEX], ['flex'], [:]) #shared library versioning MEMCACHED_UTIL_LIBRARY_VERSION=2:0:0 MEMCACHED_PROTOCAL_LIBRARY_VERSION=0:0:0 -MEMCACHED_LIBRARY_VERSION=8:0:0 +MEMCACHED_LIBRARY_VERSION=9:0:0 # | | | # +------+ | +---+ # | | | @@ -52,34 +52,52 @@ AC_SUBST(MEMCACHED_LIBRARY_VERSION) HASHKIT_LIBRARY_VERSION=1:0:0 AC_SUBST(HASHKIT_LIBRARY_VERSION) -LT_INIT +LT_PREREQ([2.2]) +LT_INIT() +LT_LANG([C++]) +LT_LANG([C]) +gl_VISIBILITY + +AX_CXX_HEADER_STDCXX_98 + if test "$ax_cv_cxx_stdcxx_98" = no; then + AC_MSG_ERROR([Your system lacks a new enough C++ compiler]) + fi + +m4_include([m4/memcached.m4]) +m4_include([m4/memcached_sasl.m4]) +m4_include([m4/gearmand.m4]) +m4_include([m4/libgearman.m4]) + AM_CONDITIONAL(BUILDING_LIBMEMCACHED, true) AM_CONDITIONAL(HAVE_LIBMEMCACHED, false) +AC_DEFINE([HAVE_LIBMEMCACHED], [1], [Enables libmemcached Support]) AM_CONDITIONAL(BUILDING_GEARMAN, false) -AM_CONDITIONAL(HAVE_LIBGEARMAN, false) AC_SEARCH_LIBS(getopt_long, gnugetopt) AC_SEARCH_LIBS(gethostbyname, nsl) -PANDORA_HAVE_LIBEVENT -my_saved_libs="$LIBS" -LIBS= -LIBS="$my_saved_libs" +case "$target_os" in + *linux*) + AS_IF([test "x$GCC" = "xyes"], + [ + LDFLAGS="$LDFLAGS -z relro -z now" + ]) + ;; + esac dnl Specialty checks -ACX_PTHREAD +AX_PTHREAD +AX_CXX_CINTTYPES CONFIG_EXTRA DETECT_BYTEORDER -ENABLE_UTILLIB SETSOCKOPT_SANITY ENABLE_HSIEH_HASH ENABLE_MURMUR_HASH +ENABLE_FNV64_HASH ENABLE_MEMASLAP PROTOCOL_BINARY_TEST ENABLE_DEPRECATED -PANDORA_HAVE_LIBINNODB -PANDORA_HAVE_SASL AC_CHECK_FUNCS([alarm]) AC_CHECK_FUNCS([dup2]) @@ -99,6 +117,7 @@ AC_CHECK_FUNCS([strerror]) AC_CHECK_FUNCS([strtol]) AC_CHECK_FUNCS([strtoul]) AC_CHECK_FUNCS([strtoull]) + AC_CHECK_HEADERS([arpa/inet.h]) AC_CHECK_HEADERS([fcntl.h]) AC_CHECK_HEADERS([libintl.h]) @@ -108,6 +127,15 @@ AC_CHECK_HEADERS([netdb.h]) AC_CHECK_HEADERS([netinet/in.h]) AC_CHECK_HEADERS([stddef.h]) AC_CHECK_HEADERS([sys/time.h]) +AC_CHECK_HEADERS([execinfo.h]) +AC_CHECK_HEADERS([cxxabi.h], + AC_DEFINE([HAVE_CXXABI_H], [1], [Have cxxabi.h]), + AC_DEFINE([HAVE_CXXABI_H], [0], [Have cxxabi.h])) + +AC_CHECK_HEADERS([sys/sysctl.h]) + +AX_COMPILER_VENDOR + AC_FUNC_ALLOCA AC_FUNC_ERROR_AT_LINE AC_FUNC_FORK @@ -127,11 +155,47 @@ AC_TYPE_UINT32_T AC_TYPE_UINT64_T AC_TYPE_UINT8_T +AC_C_BIGENDIAN +AC_C_CONST +AC_C_INLINE +AC_C_VOLATILE +AC_C_RESTRICT + +AX_CXX_GCC_ABI_DEMANGLE + +AX_SASL_OPTION + +dnl dnl The sasl functions should only be visible if we build with sasl support -AS_IF([test "x$ac_cv_sasl" = "xyes"], - [LIBMEMCACHED_WITH_SASL_SUPPORT="#define LIBMEMCACHED_WITH_SASL_SUPPORT 1"]) +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) +AX_CHECK_LIBRARY([LIBUUID], [uuid/uuid.h], [uuid], + [ + LIBUUID_LDFLAGS="-luuid" + AC_DEFINE([HAVE_LIBUUID], [ 1 ], [Have libuuid]) + ], + [ + AC_DEFINE([HAVE_LIBUUID], [ 0 ], [Have libuuid]) + ]) + +AC_CHECK_LIB([rt], [clock_gettime], + [ + RT_LIB="-lrt" + AC_SUBST(RT_LIB) + AC_DEFINE([HAVE_LIBRT], [ 1 ], [Have clock_gettime]) + ], + [ + AC_DEFINE([HAVE_LIBRT], [ 0 ], [Have clock_gettime]) + ]) + +AC_CHECK_LIB([m], [floor]) + AC_CHECK_HEADERS([atomic.h]) AS_IF([test "x$ac_cv_header_atomic_h" = "xyes"],[ AC_CHECK_FUNCS(atomic_add_64) @@ -141,6 +205,15 @@ AS_IF([test "x$ac_cv_header_atomic_h" = "xyes"],[ [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([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]) + +AC_DEFINE([HAVE_MEMCACHED_LIGHT_BINARY], [1], [Support for memcached_light]) +AC_DEFINE([MEMCACHED_LIGHT_BINARY], ["example/memcached_light"], [Support for memcached_light]) + 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") @@ -149,14 +222,24 @@ AS_IF(test "x$ac_cv_header_winsock2_h" = "xyes", AM_CFLAGS="$AM_CFLAGS $NO_WERROR" AM_CXXFLAGS="$AM_CXXFLAGS $NO_WERROR" ]) -DETECT_EAGAIN SOCKET_SEND_FLAGS +AX_CHECK_LIBRARY([LIBEVENT], [event.h], [event], + [ + LIBEVENT_LDFLAGS="-levent" + ], + [ + AC_MSG_WARN([Unable to find libevent]) + ]) +AM_CONDITIONAL(HAVE_LIBEVENT, test "x${ax_cv_have_LIBEVENT}" = "xyes") + AC_CONFIG_FILES([ Makefile docs/conf.py - libhashkit/configure.h - libmemcached/configure.h + libhashkit-1.0/configure.h + libmemcached-1.0/configure.h + libmemcached-1.2/configure.h + libmemcached-2.0/configure.h support/libmemcached.pc support/libmemcached.spec support/libmemcached-fc.spec @@ -174,6 +257,7 @@ echo " * C Compiler: $CC_VERSION" echo " * Assertions enabled: $ac_cv_assert" echo " * Debug enabled: $with_debug" echo " * Warnings as failure: $ac_cv_warnings_as_errors" +echo " * SASL support: $ac_enable_sasl" echo "" echo "---"