X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=configure.ac;h=e0558a529ee4e4ee5da80cbd071055c8a23b702d;hb=c1a3a805f06491115080459bcc7c88eab5282294;hp=ff9329bf028f24cc60a035b11c82ef09e8144878;hpb=30e386cd241ac56fd9205d12c143761475307705;p=awesomized%2Flibmemcached

diff --git a/configure.ac b/configure.ac
index ff9329bf..e0558a52 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8,18 +8,19 @@
 # the COPYING file in this directory for full text.
 
 AC_PREREQ(2.59)
-AC_INIT([libmemcached],[0.48],[http://libmemcached.org/])
-AC_CONFIG_SRCDIR([libmemcached/memcached.c])
+AC_INIT([libmemcached],[0.51],[http://libmemcached.org/])
+AC_CONFIG_SRCDIR([libmemcached/memcached.cc])
 AC_CONFIG_AUX_DIR(config)
+AC_CONFIG_MACRO_DIR(m4)
 
 PANDORA_CANONICAL_TARGET(no-vc-changelog)
 AC_CHECK_PROGS([YACC], ['bison'], [:])
 AC_CHECK_PROGS([LEX], ['flex'], [:])
 
 #shared library versioning
-MEMCACHED_UTIL_LIBRARY_VERSION=1:0:0
+MEMCACHED_UTIL_LIBRARY_VERSION=2:1:1
 MEMCACHED_PROTOCAL_LIBRARY_VERSION=0:0:0
-MEMCACHED_LIBRARY_VERSION=6:0:0
+MEMCACHED_LIBRARY_VERSION=8:1:1
 #                         | | |
 #                  +------+ | +---+
 #                  |        |     |
@@ -38,6 +39,10 @@ AC_SUBST(MEMCACHED_LIBRARY_VERSION)
 HASHKIT_LIBRARY_VERSION=1:0:0
 AC_SUBST(HASHKIT_LIBRARY_VERSION)
 
+AC_DEFINE([HAVE_LIBMEMCACHED], [ 1 ], [dummy rule for libtest])
+AC_SUBST(HAVE_LIBMEMCACHED, 1)
+AM_CONDITIONAL(HAVE_LIBMEMCACHED, true)
+
 AH_TOP([
 #ifndef CONFIG_H
 #define CONFIG_H
@@ -115,12 +120,14 @@ ENABLE_UTILLIB
 SETSOCKOPT_SANITY
 ENABLE_HSIEH_HASH
 ENABLE_MURMUR_HASH
+ENABLE_MEMASLAP
 PROTOCOL_BINARY_TEST
 WITH_MEMCACHED
 ENABLE_DEPRECATED
 PANDORA_HAVE_LIBINNODB
 PANDORA_PRINT_CALLSTACK
 PANDORA_HAVE_SASL
+WITH_LIBGEARMAN
 
 dnl The sasl functions should only be visible if we build with sasl support
 AS_IF([test "x$ac_cv_sasl" = "xyes"],
@@ -149,6 +156,7 @@ SOCKET_SEND_FLAGS
 
 AC_CONFIG_FILES([
   Makefile
+  docs/conf.py
   libhashkit/configure.h
   libmemcached/configure.h
   support/libmemcached.pc