Merge from trunk.

[awesomized/libmemcached] / configure.ac

diff --git a/configure.ac b/configure.ac
index ea9933587fee89f5bd190bae298344b28d4f36df..3631b9cdb9aebecb085fbd3cacd50097f177d3e2 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -8,8 +8,8 @@
 # the COPYING file in this directory for full text.
 
 AC_PREREQ(2.59)
-AC_INIT([libmemcached],[0.49],[http://libmemcached.org/])
-AC_CONFIG_SRCDIR([libmemcached/memcached.c])
+AC_INIT([libmemcached],[0.50],[http://libmemcached.org/])
+AC_CONFIG_SRCDIR([libmemcached/memcached.cc])
 AC_CONFIG_AUX_DIR(config)
 
 PANDORA_CANONICAL_TARGET(no-vc-changelog)
@@ -19,7 +19,7 @@ AC_CHECK_PROGS([LEX], ['flex'], [:])
 #shared library versioning
 MEMCACHED_UTIL_LIBRARY_VERSION=2:0:0
 MEMCACHED_PROTOCAL_LIBRARY_VERSION=0:0:0
-MEMCACHED_LIBRARY_VERSION=7:0:0
+MEMCACHED_LIBRARY_VERSION=8:0:0
 #                         | | |
 #                  +------+ | +---+
 #                  |        |     |
@@ -115,6 +115,7 @@ ENABLE_UTILLIB
 SETSOCKOPT_SANITY
 ENABLE_HSIEH_HASH
 ENABLE_MURMUR_HASH
+ENABLE_MEMASLAP
 PROTOCOL_BINARY_TEST
 WITH_MEMCACHED
 ENABLE_DEPRECATED
@@ -149,6 +150,7 @@ SOCKET_SEND_FLAGS
 
 AC_CONFIG_FILES([
   Makefile
+  docs/conf.py
   libhashkit/configure.h
   libmemcached/configure.h
   support/libmemcached.pc