X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=configure.ac;h=658dd5b76d121584c8e9969ba6c1b28f0787a7b0;hb=395c7b6c2ef46634f09e681116268646106beb9f;hp=1bcf1ae201a0aca3bd7544db1cf71ef1e19ca219;hpb=ea32b463888ecfd7525eb88859cc2bb4af9b24d3;p=awesomized%2Flibmemcached diff --git a/configure.ac b/configure.ac index 1bcf1ae2..658dd5b7 100644 --- a/configure.ac +++ b/configure.ac @@ -6,7 +6,7 @@ # the COPYING file in this directory for full text. AC_PREREQ(2.59) -AC_INIT([libmemcached],[0.35],[http://tangent.org/552/libmemcached.html]) +AC_INIT([libmemcached],[0.37],[http://tangent.org/552/libmemcached.html]) AC_CONFIG_SRCDIR([libmemcached/memcached.c]) AC_CONFIG_AUX_DIR(config) AM_CONFIG_HEADER([config.h]) @@ -14,152 +14,17 @@ AC_CONFIG_MACRO_DIR([m4]) PANDORA_CANONICAL_TARGET -#shared library versioning -MEMCACHED_LIBRARY_VERSION=3:0:0 -# | | | -# +------+ | +---+ -# | | | -# current:revision:age -# | | | -# | | +- increment if interfaces have been added -# | | set to zero if interfaces have been removed or changed -# | +- 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_LIBRARY_VERSION) -MEMCACHEDUTIL_LIBRARY_VERSION=0:0:0 -AC_SUBST(MEMCACHEDUTIL_LIBRARY_VERSION) -MEMCACHEDPROTOCOL_LIBRARY_VERSION=0:0:0 -AC_SUBST(MEMCACHEDPROTOCOL_LIBRARY_VERSION) - - -# libmemcached versioning when linked with GNU ld. -if test "$lt_cv_prog_gnu_ld" = "yes" -then - LD_VERSION_SCRIPT="-Wl,--version-script=\$(top_srcdir)/libmemcached/libmemcached.ver" - LD_UTIL_VERSION_SCRIPT="-Wl,--version-script=\$(top_srcdir)/libmemcached/util/libmemcachedutil.ver" - LD_PROTOCOL_VERSION_SCRIPT="-Wl,--version-script=\$(top_srcdir)/libmemcached/protocol/libmemcachedprotocol.ver" -fi -AC_SUBST(LD_VERSION_SCRIPT) -AC_SUBST(LD_UTIL_VERSION_SCRIPT) -AC_SUBST(LD_PROTOCOL_VERSION_SCRIPT) - - - -#-------------------------------------------------------------------- -# Check for libevent -#-------------------------------------------------------------------- -trylibeventdir="" -AC_ARG_WITH(libevent, - [ --with-libevent=PATH Specify path to libevent installation ], - [ - if test "x$withval" != "xno" ; then - trylibeventdir=$withval - fi - ] -) - -dnl ------------------------------------------------------ -dnl libevent detection. swiped from Tor. modified a bit. - -LIBEVENT_URL=http://www.monkey.org/~provos/libevent/ - -AC_CACHE_CHECK([for libevent directory], ac_cv_libevent_dir, [ - saved_LIBS="$LIBS" - saved_LDFLAGS="$LDFLAGS" - saved_CPPFLAGS="$CPPFLAGS" - le_found=no - for ledir in $trylibeventdir "" $prefix /usr/local ; do - LDFLAGS="$saved_LDFLAGS" - LIBS="$saved_LIBS -levent" - - # Skip the directory if it isn't there. - if test ! -z "$ledir" -a ! -d "$ledir" ; then - continue; - fi - if test ! -z "$ledir" ; then - if test -d "$ledir/lib" ; then - LDFLAGS="-L$ledir/lib $LDFLAGS" - else - LDFLAGS="-L$ledir $LDFLAGS" - fi - if test -d "$ledir/include" ; then - CPPFLAGS="-I$ledir/include $CPPFLAGS" - else - CPPFLAGS="-I$ledir $CPPFLAGS" - fi - fi - # Can I compile and link it? - AC_TRY_LINK([#include -#include -#include ], [ event_init(); ], - [ libevent_linked=yes ], [ libevent_linked=no ]) - if test $libevent_linked = yes; then - if test ! -z "$ledir" ; then - ac_cv_libevent_dir=$ledir - else - ac_cv_libevent_dir="(system)" - fi - le_found=yes - break - fi - done - LIBS="$saved_LIBS" - LDFLAGS="$saved_LDFLAGS" - CPPFLAGS="$saved_CPPFLAGS" - if test $le_found = no ; then - AC_MSG_ERROR([libevent is required. You can get it from $LIBEVENT_URL - - If it's already installed, specify its path using --with-libevent=/dir/ -]) - fi -]) -LIBS="$LIBS -levent" -if test $ac_cv_libevent_dir != "(system)"; then - if test -d "$ac_cv_libevent_dir/lib" ; then - LDFLAGS="-L$ac_cv_libevent_dir/lib $LDFLAGS" - le_libdir="$ac_cv_libevent_dir/lib" - else - LDFLAGS="-L$ac_cv_libevent_dir $LDFLAGS" - le_libdir="$ac_cv_libevent_dir" - fi - if test -d "$ac_cv_libevent_dir/include" ; then - CPPFLAGS="-I$ac_cv_libevent_dir/include $CPPFLAGS" - else - CPPFLAGS="-I$ac_cv_libevent_dir $CPPFLAGS" - fi -fi - - -#-------------------------------------------------------------------- -# Check for libpthread -#-------------------------------------------------------------------- - -ACX_PTHREAD(,AC_MSG_ERROR(could not find libpthread)) -LIBS="${PTHREAD_LIBS} ${LIBS}" -CFLAGS="${PTHREAD_CFLAGS} ${CFLAGS}" -CC="$PTHREAD_CC" - +HASHKIT_LIBRARY_VERSION=0:0:0 +AC_SUBST(HASHKIT_LIBRARY_VERSION) AC_SEARCH_LIBS(getopt_long, gnugetopt) -AC_SEARCH_LIBS(socket, socket) AC_SEARCH_LIBS(gethostbyname, nsl) -save_LIBS="$LIBS" -LIBS="$LIBS -lm" -AC_LINK_IFELSE( - [AC_LANG_PROGRAM( - [[ -#include - ]],[[ - float f= floorf((float) 1.0); - ]], - [LIBM="-lm"],[LIBM=""])]) +AC_CHECK_FUNCS_ONCE([getline]) -AC_SUBST(LIBM) -LIBS="$save_LIBS" - -AC_SEARCH_LIBS(floorf, m) +PANDORA_HAVE_LIBEVENT +PANDORA_REQUIRE_PTHREAD +PANDORA_CXX_DEMANGLE dnl Specialty checks DETECT_BYTEORDER @@ -167,20 +32,26 @@ ENABLE_UTILLIB SETSOCKOPT_SANITY ENABLE_HSIEH_HASH REQUIRE_POD2MAN +REQUIRE_PODCHECKER PROTOCOL_BINARY_TEST WITH_MEMCACHED ENABLE_DEPRECATED PANDORA_HAVE_LIBINNODB +PANDORA_PRINT_CALLSTACK + +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) + 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_CONFIG_FILES([ Makefile - clients/Makefile - tests/Makefile docs/Makefile - example/Makefile - libmemcached/Makefile - libmemcached/memcached_configure.h - support/Makefile + libmemcached/configure.h support/libmemcached.pc support/libmemcached.spec support/libmemcached-fc.spec