X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=configure.ac;h=5198402bd1eb5adb1500792a7791380a49c34aff;hb=a0fa9535659f0f5a9678406f47201bfd47245114;hp=f1333afad7b0c34c1aef6dc296e195ac621b6c8e;hpb=bb0ec116ceb30ec558195190c343dbcb18e08249;p=awesomized%2Flibmemcached diff --git a/configure.ac b/configure.ac index f1333afa..5198402b 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.34],[http://tangent.org/552/libmemcached.html]) +AC_INIT([libmemcached],[0.35],[http://tangent.org/552/libmemcached.html]) AC_CONFIG_SRCDIR([libmemcached/memcached.c]) AC_CONFIG_AUX_DIR(config) AM_CONFIG_HEADER([config.h]) @@ -44,36 +44,15 @@ AC_SUBST(LD_VERSION_SCRIPT) AC_SUBST(LD_UTIL_VERSION_SCRIPT) AC_SUBST(LD_PROTOCOL_VERSION_SCRIPT) - -#-------------------------------------------------------------------- -# Check for libpthread -#-------------------------------------------------------------------- - -ACX_PTHREAD(,AC_MSG_ERROR(could not find libpthread)) -LIBS="${PTHREAD_LIBS} ${LIBS}" -CFLAGS="${PTHREAD_CFLAGS} ${CFLAGS}" -CC="$PTHREAD_CC" +PANDORA_HAVE_LIBEVENT +PANDORA_REQUIRE_PTHREAD 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_SUBST(LIBM) -LIBS="$save_LIBS" - -AC_SEARCH_LIBS(floorf, m) +AC_CHECK_LIB(m, floor, [], AC_CHECK_LIB(m, __infinity)) dnl Specialty checks DETECT_BYTEORDER