X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=configure.ac;h=19bc4bb53f8a1096feab19bda5c0344362e3ee0b;hb=d227f2a06b136be62333f220b80226c0ec1a472f;hp=c8054fe357bfb99b11c2d00f023700cf58b9c235;hpb=c4e5fc1697e0bc22da0adda38c73cc32d2b40523;p=m6w6%2Flibmemcached

diff --git a/configure.ac b/configure.ac
index c8054fe3..19bc4bb5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7,7 +7,7 @@
 # the COPYING file in this directory for full text.
 
 AC_PREREQ(2.59)
-AC_INIT([libmemcached],[0.37],[http://tangent.org/552/libmemcached.html])
+AC_INIT([libmemcached],[0.40],[http://libmemcached.org/])
 AC_CONFIG_SRCDIR([libmemcached/memcached.c])
 AC_CONFIG_AUX_DIR(config)
 AM_CONFIG_HEADER([config.h])
@@ -16,7 +16,7 @@ AC_CONFIG_MACRO_DIR([m4])
 PANDORA_CANONICAL_TARGET
 
 #shared library versioning
-MEMCACHED_LIBRARY_VERSION=4:0:0
+MEMCACHED_LIBRARY_VERSION=5:0:0
 #                         | | |
 #                  +------+ | +---+
 #                  |        |     |
@@ -54,6 +54,12 @@ WITH_MEMCACHED
 ENABLE_DEPRECATED
 PANDORA_HAVE_LIBINNODB
 PANDORA_PRINT_CALLSTACK
+PANDORA_HAVE_SASL
+
+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"])
+AC_SUBST(LIBMEMCACHED_WITH_SASL_SUPPORT)
 
 AC_CHECK_HEADERS([atomic.h])
 AS_IF([test "x$ac_cv_header_atomic_h" = "xyes"],[
@@ -67,6 +73,7 @@ AS_IF([test "x$ac_cv_header_atomic_h" = "xyes"],[
 AC_CONFIG_FILES([
   Makefile
   docs/Makefile
+  libhashkit/configure.h
   libmemcached/configure.h
   support/libmemcached.pc
   support/libmemcached.spec