X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;ds=sidebyside;f=configure.ac;h=5198402bd1eb5adb1500792a7791380a49c34aff;hb=a0fa9535659f0f5a9678406f47201bfd47245114;hp=0601a1752c6fe6176394f85c32a8c690a4a97e80;hpb=34418e51585216006d5b241fc9104dc4b88d1be0;p=awesomized%2Flibmemcached

diff --git a/configure.ac b/configure.ac
index 0601a175..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.33],[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])
@@ -37,43 +37,22 @@ AC_SUBST(MEMCACHEDPROTOCOL_LIBRARY_VERSION)
 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)/libmemcachedutil/libmemcachedutil.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 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 <stdlib.h>
-    ]],[[
-      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
@@ -94,7 +73,6 @@ AC_CONFIG_FILES([
   example/Makefile
   libmemcached/Makefile
   libmemcached/memcached_configure.h
-  libmemcachedutil/Makefile
   support/Makefile
   support/libmemcached.pc
   support/libmemcached.spec