X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=configure.ac;h=09d8ecb360d433ff0bbec1e7ba89543d277cbfbf;hb=97591a7118a4c0342eaa63575893ca231570f363;hp=1cab94d764d4931f0b42716f9e7a69a0a32aef16;hpb=d00f1077af47252fdf716acf174436b9973c966d;p=awesomized%2Flibmemcached diff --git a/configure.ac b/configure.ac index 1cab94d7..09d8ecb3 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,3 @@ -#!/usr/bin/env bash # LibmemcacheD # Copyright (C) 2011-2012 Data Differential, http://datadifferential.com/ # Copyright (C) 2006-2010 Brian Aker, Monty Taylor, Trond Norbye @@ -7,29 +6,21 @@ # Use and distribution licensed under the BSD license. See # the COPYING file in this directory for full text. -AC_INIT([libmemcached],[1.0.10],[http://libmemcached.org/]) - -AC_CONFIG_AUX_DIR([config]) +AC_INIT([libmemcached],[1.0.12],[http://libmemcached.org/]) +AC_CONFIG_AUX_DIR([build-aux]) +AC_CONFIG_MACRO_DIR([m4]) AC_CANONICAL_TARGET +AC_ARG_PROGRAM +AC_USE_SYSTEM_EXTENSIONS -AM_INIT_AUTOMAKE - -AC_CANONICAL_HOST -AC_CANONICAL_BUILD +AM_INIT_AUTOMAKE([-Wall -Werror -Wno-portability subdir-objects foreign tar-ustar]) AC_PREREQ([2.61]) -AC_CONFIG_MACRO_DIR([m4]) - AC_CONFIG_HEADERS([config.h:config.in])dnl Keep filename to 8.3 for MS-DOS. - AC_CONFIG_SRCDIR([libmemcached/memcached.cc]) -PANDORA_CANONICAL_TARGET([no-vc-changelog]) -AC_CHECK_PROGS([YACC], ['bison'], [:]) -AC_CHECK_PROGS([LEX], ['flex'], [:]) - #shared library versioning MEMCACHED_UTIL_LIBRARY_VERSION=2:0:0 MEMCACHED_PROTOCAL_LIBRARY_VERSION=0:0:0 @@ -44,24 +35,28 @@ MEMCACHED_LIBRARY_VERSION=11:0:0 # | +- increment if source code has changed # | set to zero if current is incremented # +- increment if interfaces have been added, removed or changed -AC_SUBST(MEMCACHED_UTIL_LIBRARY_VERSION) -AC_SUBST(MEMCACHED_PROTOCAL_LIBRARY_VERSION) -AC_SUBST(MEMCACHED_LIBRARY_VERSION) +AC_SUBST([MEMCACHED_UTIL_LIBRARY_VERSION]) +AC_SUBST([MEMCACHED_PROTOCAL_LIBRARY_VERSION]) +AC_SUBST([MEMCACHED_LIBRARY_VERSION]) +AX_HEX_VERSION([LIBMEMCACHED],[$VERSION]) +AX_HEX_VERSION([LIBHASHKIT],[1.0.0]) -HASHKIT_LIBRARY_VERSION=2:0:0 -AC_SUBST(HASHKIT_LIBRARY_VERSION) +m4_include([libhashkit/include.m4]) LT_PREREQ([2.2]) -LT_INIT() +LT_INIT LT_LANG([C++]) -LT_LANG([C]) + +AX_PLATFORM + gl_VISIBILITY +m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])]) 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 +AS_IF([ test "$ax_cv_cxx_stdcxx_98" = no ],[ + AC_MSG_ERROR([Your system lacks a new enough C++ compiler]) + ]) # Adding support for libtest m4_include([libtest/yatl.m4]) @@ -70,15 +65,12 @@ 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) -AM_CONDITIONAL(HAVE_LIBDRIZZLE, false) +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) - -AC_SEARCH_LIBS(getopt_long, gnugetopt) -AC_SEARCH_LIBS(gethostbyname, nsl) +AM_CONDITIONAL([BUILDING_GEARMAN], [false]) dnl Specialty checks AX_CXX_CINTTYPES @@ -92,29 +84,19 @@ ENABLE_MEMASLAP PROTOCOL_BINARY_TEST ENABLE_DEPRECATED -AC_CHECK_FUNCS([alarm]) -AC_CHECK_FUNCS([clock_gettime]) -AC_CHECK_FUNCS([dup2]) -AC_CHECK_FUNCS([getline]) -AC_CHECK_FUNCS([gettimeofday]) -AC_CHECK_FUNCS([memchr]) -AC_CHECK_FUNCS([memmove]) -AC_CHECK_FUNCS([memset]) -AC_CHECK_FUNCS([pipe2]) -AC_CHECK_FUNCS([select]) -AC_CHECK_FUNCS([setenv]) -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([strtol]) -AC_CHECK_FUNCS([strtoul]) -AC_CHECK_FUNCS([strtoull]) +# Checks for programs. +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) +# 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]) @@ -124,17 +106,48 @@ AC_CHECK_HEADERS([malloc.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([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([time.h]) AC_CHECK_HEADERS([unistd.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_HEADER_TIME -AC_CHECK_HEADERS([sys/sysctl.h]) +# Checks for typedefs, structures, and compiler characteristics. + +# Checks for library functions. + +AC_CHECK_FUNCS([alarm]) +AC_CHECK_FUNCS([dup2]) +AC_CHECK_FUNCS([getline]) +AC_CHECK_FUNCS([gettimeofday]) +AC_CHECK_FUNCS([memchr]) +AC_CHECK_FUNCS([memmove]) +AC_CHECK_FUNCS([memset]) +AC_CHECK_FUNCS([pipe2]) +AC_CHECK_FUNCS([select]) +AC_CHECK_FUNCS([setenv]) +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([strtol]) +AC_CHECK_FUNCS([strtoul]) +AC_CHECK_FUNCS([strtoull]) +AC_FUNC_ALLOCA +AC_FUNC_ERROR_AT_LINE +AC_FUNC_FORK +AC_FUNC_MALLOC +AC_FUNC_REALLOC +AC_FUNC_STRERROR_R AC_CHECK_HEADER(umem.h, [ AC_DEFINE([HAVE_UMEM_H], 1, @@ -146,12 +159,6 @@ AM_CONDITIONAL([BUILD_CACHE], [test "x$build_cache" = "xyes"]) AX_COMPILER_VENDOR -AC_FUNC_ALLOCA -AC_FUNC_ERROR_AT_LINE -AC_FUNC_FORK -AC_FUNC_MALLOC -AC_FUNC_REALLOC -AC_FUNC_STRERROR_R AC_HEADER_STDBOOL AC_TYPE_INT16_T AC_TYPE_INT32_T @@ -174,43 +181,40 @@ 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" ] - ]) + ],[ 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], - [ +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_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([m], [floor]) AC_CHECK_FUNCS([sigignore]) AC_CHECK_HEADERS([atomic.h]) AS_IF([test "x$ac_cv_header_atomic_h" = "xyes"],[ - AC_CHECK_FUNCS(atomic_add_64) - AC_CHECK_FUNCS(atomic_add_32) + 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], @@ -232,8 +236,8 @@ 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 -AC_CHECK_FUNCS(setppriv, [ - AC_CHECK_HEADER(priv.h, [ +AC_CHECK_FUNCS([setppriv], [ + AC_CHECK_HEADER([priv.h], [ AC_DEFINE([HAVE_DROP_PRIVILEGES], 1, [Define this if you have an implementation of drop_privileges()]) build_solaris_privs=yes @@ -250,58 +254,27 @@ AS_IF(test "x$ac_cv_header_winsock2_h" = "xyes", ]) 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") - -dnl Check if we're a little-endian or a big-endian system, needed by hash code -AC_DEFUN([AC_C_ENDIAN], -[AC_CACHE_CHECK(for endianness, ac_cv_c_endian, -[ - AC_RUN_IFELSE( - [AC_LANG_PROGRAM([], [dnl - long val = 1; - char *c = (char *) &val; - exit(*c == 1); - ]) - ],[ - ac_cv_c_endian=big - ],[ - ac_cv_c_endian=little - ]) -]) -if test $ac_cv_c_endian = big; then - AC_DEFINE(ENDIAN_BIG, 1, [machine is bigendian]) -fi -if test $ac_cv_c_endian = little; then - AC_DEFINE(ENDIAN_LITTLE, 1, [machine is littleendian]) -fi -]) +AX_UUID_GENERATE_TIME_SAFE -AX_CHECK_SOCK_CLOEXEC([AC_DEFINE([HAVE_SOCK_CLOEXEC], [1], [Check for SOCK_CLOEXEC.])], - [AC_DEFINE([HAVE_SOCK_CLOEXEC], [0], [Check for SOCK_CLOEXEC.])]) -AX_PTHREAD(, [AC_MSG_ERROR(could not find libpthread)]) +AX_PTHREAD(, [AC_MSG_ERROR([could not find libpthread])]) +AX_PTHREAD_TIMEDJOIN_NP +PANDORA_ENABLE_DTRACE +AX_ENDIAN +AX_HEX_VERSION +AX_ASSERT +AX_CXX_COMPILER_VERSION AX_HARDEN_COMPILER_FLAGS -AX_DEBUG +AX_AM_JOBSERVER([yes]) AC_CONFIG_FILES([ Makefile docs/conf.py - 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 ]) AC_OUTPUT @@ -312,8 +285,12 @@ echo " * Installation prefix: $prefix" echo " * System type: $host_vendor-$host_os" echo " * Host CPU: $host_cpu" echo " * C Compiler: $CC_VERSION" -echo " * Assertions enabled: $ac_cv_assert" -echo " * Debug enabled: $with_debug" +echo " * C Flags: $CFLAGS" +echo " * C++ Compiler: $CXX_VERSION" +echo " * C++ Flags: $CXXFLAGS" +echo " * CPP Flags: $CPPFLAGS" +echo " * Assertions enabled: $ax_enable_assert" +echo " * Debug enabled: $ax_enable_debug" echo " * Warnings as failure: $ac_cv_warnings_as_errors" echo " * SASL support: $ac_enable_sasl" echo ""