X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=configure.ac;h=53caf24162f6acd72813a60ead610f9a7715c906;hb=3dc31b013fe325e7c2f5946e37546d2b1a014509;hp=d7b45a32bb2da93ad326a8dcd4caa0fdb0e0cdb4;hpb=376136a8d95d1942dcdcbf680838750532d20622;p=m6w6%2Flibmemcached

diff --git a/configure.ac b/configure.ac
index d7b45a32..53caf241 100644
--- a/configure.ac
+++ b/configure.ac
@@ -91,7 +91,6 @@ AX_PTHREAD
 AX_CXX_CINTTYPES
 CONFIG_EXTRA
 DETECT_BYTEORDER
-ENABLE_UTILLIB
 SETSOCKOPT_SANITY
 ENABLE_HSIEH_HASH
 ENABLE_MURMUR_HASH
@@ -99,8 +98,6 @@ ENABLE_FNV64_HASH
 ENABLE_MEMASLAP
 PROTOCOL_BINARY_TEST
 ENABLE_DEPRECATED
-PANDORA_HAVE_LIBINNODB
-PANDORA_HAVE_SASL
 
 AC_CHECK_FUNCS([alarm])
 AC_CHECK_FUNCS([dup2])
@@ -137,7 +134,6 @@ AC_CHECK_HEADERS([cxxabi.h],
                  AC_DEFINE([HAVE_CXXABI_H], [0], [Have cxxabi.h]))
 
 AX_COMPILER_VENDOR
-AC_CXX_HEADER_STDCXX_98
 
 AC_FUNC_ALLOCA
 AC_FUNC_ERROR_AT_LINE
@@ -166,9 +162,22 @@ AC_C_RESTRICT
 
 AX_CXX_GCC_ABI_DEMANGLE
 
+AX_SASL_OPTION
+
+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" ]
+           ])
+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])
@@ -186,17 +195,6 @@ AC_CHECK_LIB([rt], [clock_gettime],
 
 AC_CHECK_LIB([m], [floor])
 
-dnl The sasl functions should only be visible if we build with sasl support
-AS_IF([test "x$ac_cv_sasl" = "xyes"],
-      [
-        [ LIBMEMCACHED_WITH_SASL_SUPPORT="#define LIBMEMCACHED_WITH_SASL_SUPPORT 1" ]
-      ],
-      [
-        [ LIBMEMCACHED_WITH_SASL_SUPPORT="#define LIBMEMCACHED_WITH_SASL_SUPPORT 0" ]
-       ]
-      )
-AC_SUBST(LIBMEMCACHED_WITH_SASL_SUPPORT)
-
 AC_CHECK_HEADERS([atomic.h])
 AS_IF([test "x$ac_cv_header_atomic_h" = "xyes"],[
       AC_CHECK_FUNCS(atomic_add_64)
@@ -249,6 +247,7 @@ echo "   * C Compiler:                $CC_VERSION"
 echo "   * Assertions enabled:        $ac_cv_assert"
 echo "   * Debug enabled:             $with_debug"
 echo "   * Warnings as failure:       $ac_cv_warnings_as_errors"
+echo "   * SASL support:              $ac_enable_sasl"
 echo ""
 echo "---"