X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=configure.ac;h=a70143abc8b8a3c51715e0462dc7c46897b11a94;hb=6b7d046bd25c3c012c20b184415e81266ad037e3;hp=b255cefb2e30132e7c0a8d3bcff50a0cadbfa49e;hpb=0ce6b69e0f8e25e50bd878678b1444651093bac4;p=awesomized%2Flibmemcached diff --git a/configure.ac b/configure.ac index b255cefb..a70143ab 100644 --- a/configure.ac +++ b/configure.ac @@ -1,12 +1,12 @@ # LibmemcacheD -# Copyright (C) 2011-2012 Data Differential, http://datadifferential.com/ +# Copyright (C) 2011-2013 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],[1.0.14],[http://libmemcached.org/]) +AC_INIT([libmemcached],[1.0.17],[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 @@ -98,9 +100,13 @@ PROTOCOL_BINARY_TEST ENABLE_DEPRECATED # Checks for programs. +AC_PROG_AWK +AC_PROG_SED +AC_PROG_MKDIR_P AC_CHECK_PROGS([LEX],['flex'],[:]) AC_CHECK_PROGS([YACC],['bison'],[:]) AX_PROG_SPHINX_BUILD +AX_PROG_MEMCACHED # Checks for libraries. AC_SEARCH_LIBS([getopt_long],[gnugetopt]) @@ -108,10 +114,11 @@ AC_SEARCH_LIBS([gethostbyname],[nsl]) # Checks for header files. AC_CHECK_HEADERS_ONCE([arpa/inet.h]) -AC_CHECK_HEADERS_ONCE([dlfcn.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]) @@ -121,6 +128,7 @@ 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]) @@ -130,14 +138,16 @@ 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. @@ -160,6 +170,7 @@ 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]) @@ -184,6 +195,16 @@ 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 @@ -213,15 +234,9 @@ AC_CHECK_LIB([rt],[clock_gettime], 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 -AS_IF([test "x$enable_static" = "xyes"], - [AC_CHECK_LIB([dl],[dlopen], - [AC_SUBST([DL_LIB],[-ldl]) - AC_DEFINE([HAVE_LIBDL],[1],[Have dlopen])])], - [AC_DEFINE([HAVE_LIBDL], [0], [Have dlopen])]) -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"], @@ -251,7 +266,6 @@ 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"], @@ -263,7 +277,6 @@ 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 @@ -278,10 +291,13 @@ AC_DEFUN([CHECK_FOR_PTHREAD_AND_SASL], ]) CHECK_FOR_PTHREAD_AND_SASL - -# backtrace() does not work with static builds. -AS_IF([test "x$enable_static" = "xyes"], - [AC_DEFINE([AX_ENABLE_BACKTRACE],[1],[Support for backtrace().])]) +# backtrace(), others require shared builds +AC_DEFUN([__ENABLE_SHARED], + [AC_REQUIRE([AX_PLATFORM]) + AS_IF([test "x${TARGET_WINDOWS}" = "xtrue"],[enable_shared=no]) + 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 @@ -313,8 +329,9 @@ 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: $ax_sasl_option" +echo " * SASL support: $ac_enable_sasl" echo " * make -j: $enable_jobserver" echo " * VCS checkout: $ac_cv_vcs_checkout" echo ""