Update tests to use generic keys.

[m6w6/libmemcached] / configure.ac

diff --git a/configure.ac b/configure.ac
index 615da41b5d6277e64ae804e955e9e2cc88316204..d7b45a32bb2da93ad326a8dcd4caa0fdb0e0cdb4 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -7,7 +7,7 @@
 # Use and distribution licensed under the BSD license.  See
 # the COPYING file in this directory for full text.
 
-AC_INIT([libmemcached],[1.0.3],[http://libmemcached.org/])
+AC_INIT([libmemcached],[1.0.4],[http://libmemcached.org/])
 
 AC_CONFIG_AUX_DIR(config)
 
@@ -58,6 +58,11 @@ LT_LANG([C++])
 LT_LANG([C])
 gl_VISIBILITY
 
+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
+
 m4_include([m4/memcached.m4])
 m4_include([m4/memcached_sasl.m4])
 m4_include([m4/gearmand.m4])
@@ -72,8 +77,6 @@ AM_CONDITIONAL(BUILDING_GEARMAN, false)
 AC_SEARCH_LIBS(getopt_long, gnugetopt)
 AC_SEARCH_LIBS(gethostbyname, nsl)
 
-PANDORA_HAVE_LIBEVENT
-
 case "$target_os" in
   *linux*)
        AS_IF([test "x$GCC" = "xyes"],
@@ -85,6 +88,7 @@ case "$target_os" in
 
 dnl Specialty checks
 AX_PTHREAD
+AX_CXX_CINTTYPES
 CONFIG_EXTRA
 DETECT_BYTEORDER
 ENABLE_UTILLIB
@@ -129,8 +133,10 @@ AC_CHECK_HEADERS([sys/time.h])
 AC_CHECK_HEADERS([sasl/sasl.h])
 AC_CHECK_HEADERS([execinfo.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_DEFINE([HAVE_CXXABI_H], [1], [Have cxxabi.h]),
+                 AC_DEFINE([HAVE_CXXABI_H], [0], [Have cxxabi.h]))
+
+AX_COMPILER_VENDOR
 AC_CXX_HEADER_STDCXX_98
 
 AC_FUNC_ALLOCA
@@ -160,6 +166,14 @@ AC_C_RESTRICT
 
 AX_CXX_GCC_ABI_DEMANGLE
 
+AX_CHECK_LIBRARY([LIBUUID], [uuid/uuid.h], [uuid], 
+                 [
+                  LIBUUID_LDFLAGS="-luuid"
+                  ],
+                 [
+                  AC_DEFINE([HAVE_LIBUUID], [ 0 ], [Have libuuid])
+                  ])
+
 AC_CHECK_LIB([rt], [clock_gettime], 
              [
               RT_LIB="-lrt"
@@ -200,9 +214,17 @@ AS_IF(test "x$ac_cv_header_winsock2_h" = "xyes",
        AM_CFLAGS="$AM_CFLAGS $NO_WERROR"
        AM_CXXFLAGS="$AM_CXXFLAGS $NO_WERROR"
       ])
-DETECT_EAGAIN
 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")
+
 AC_CONFIG_FILES([
   Makefile
   docs/conf.py