Updates for version 0.37.

diff --git a/ChangeLog b/ChangeLog
index 357f86146ecb24b9e427977627c1dc6f6941f6f9..35a900113c918be16eb0a292a7151435ab4fee98 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,11 +1,9 @@
-0.37
+0.37 Mon Jan 11 16:29:57 PST 2010
  * Fixed build for libhashkit.
  * Fixed install path regression.  
  * Modified RPM to strict check install. 
  * Added documentation for memcached_server_cursor();
-
  * Added memcached_servers_reset().
-
  * Modified memcached_st to remove dead cursor_server member.
 
 0.36 Wed Jan  6 18:23:50 PST 2010

diff --git a/clients/include.am b/clients/include.am
index 2e4d87eeb58fdaed4bb92c994380669ba178b5a4..1d09efc3d4ddf0026e9e7b1c8b85a700e11b6eb2 100644 (file)
--- a/clients/include.am
+++ b/clients/include.am
@@ -69,7 +69,7 @@ clients_memslap_SOURCES= \
                clients/ms_stats.c \
                clients/ms_task.c \
                clients/ms_thread.c
-clients_memslap_LDADD= $(LTLIBEVENT) clients/libgenexec.la $(CLIENTS_LDADDS)
+clients_memslap_LDADD= $(LTLIBEVENT) clients/libgenexec.la $(CLIENTS_LDADDS) $(LIBM)
 
 clients_memcapable_SOURCES= clients/memcapable.c
 if BUILD_BYTEORDER

diff --git a/configure.ac b/configure.ac
index 658dd5b76d121584c8e9969ba6c1b28f0787a7b0..f65a7431d232568193b8aecdd89541b0c89bdbc6 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -14,6 +14,21 @@ AC_CONFIG_MACRO_DIR([m4])
 
 PANDORA_CANONICAL_TARGET
 
+#shared library versioning
+MEMCACHED_LIBRARY_VERSION=4:0:0
+#                         | | |
+#                  +------+ | +---+
+#                  |        |     |
+#                 current:revision:age
+#                  |        |     |
+#                  |        |     +- increment if interfaces have been added
+#                  |        |        set to zero if interfaces have been removed or changed
+#                  |        +- increment if source code has changed
+#                  |           set to zero if current is incremented
+#                  +- increment if interfaces have been added, removed or changed
+AC_SUBST(MEMCACHED_LIBRARY_VERSION)
+
+
 HASHKIT_LIBRARY_VERSION=0:0:0
 AC_SUBST(HASHKIT_LIBRARY_VERSION)
 

diff --git a/libmemcached/include.am b/libmemcached/include.am
index 8adde9f033fefcd6ddfd1edf6ccfe566e4ea9699..1a00204d8eddb4910e3ba4893841eb2159c9c1f8 100644 (file)
--- a/libmemcached/include.am
+++ b/libmemcached/include.am
@@ -13,7 +13,6 @@ noinst_HEADERS+= \
                 libmemcached/io.h \
                 libmemcached/internal.h \
                 libmemcached/common.h \
-                libmemcached/memcached/protocol_binary.h \
                 libmemcached/protocol/common.h \
                 libmemcached/protocol/ascii_handler.h \
                 libmemcached/protocol/binary_handler.h
@@ -30,6 +29,7 @@ nobase_include_HEADERS+= \
                         libmemcached/get.h \
                         libmemcached/memcached.h \
                         libmemcached/memcached.hpp \
+                        libmemcached/memcached/protocol_binary.h \
                         libmemcached/protocol/cache.h \
                         libmemcached/protocol/callback.h \
                         libmemcached/protocol_handler.h \
@@ -108,7 +108,7 @@ endif
 
 libmemcached_libmemcached_la_DEPENDENCIES= libmemcached/libmemcachedcallbacks.la libmemcached/libmemcachedinternal.la
 libmemcached_libmemcached_la_LIBADD= $(LIBM) libmemcached/libmemcachedcallbacks.la libmemcached/libmemcachedinternal.la
-libmemcached_libmemcached_la_LDFLAGS= ${AM_LDFLAGS} -version-info 3:0:0
+libmemcached_libmemcached_la_LDFLAGS= ${AM_LDFLAGS} -version-info ${MEMCACHED_LIBRARY_VERSION}
 
 if BUILD_LIBMEMCACHEDUTIL
 nobase_include_HEADERS+= \

diff --git a/m4/pandora_canonical.m4 b/m4/pandora_canonical.m4
index 32574f98f899d00838994a8cb8f9c787e45aa835..b9b3e455e6b889db2e4d21e720c11eda46d739c2 100644 (file)
--- a/m4/pandora_canonical.m4
+++ b/m4/pandora_canonical.m4
@@ -4,7 +4,7 @@ dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
 
 dnl Which version of the canonical setup we're using
-AC_DEFUN([PANDORA_CANONICAL_VERSION],[0.92])
+AC_DEFUN([PANDORA_CANONICAL_VERSION],[0.94])
 
 AC_DEFUN([PANDORA_FORCE_DEPEND_TRACKING],[
   AC_ARG_ENABLE([fat-binaries],

diff --git a/m4/pandora_have_libmemcached.m4 b/m4/pandora_have_libmemcached.m4
index 0c0289997877a37065bdece9105ae0c1bceffa2a..25c056131ea9789721df2dcb8d302db9a224181a 100644 (file)
--- a/m4/pandora_have_libmemcached.m4
+++ b/m4/pandora_have_libmemcached.m4
@@ -24,10 +24,28 @@ AC_DEFUN([_PANDORA_SEARCH_LIBMEMCACHED],[
       memcached_dump_func *df;
       memcached_lib_version();
     ])
+    AC_LIB_HAVE_LINKFLAGS(memcachedprotocol,,[
+      #include <libmemcached/protocol_handler.h>
+    ],[
+      struct memcached_protocol_st *protocol_handle;
+      protocol_handle= memcached_protocol_create_instance();
+    ])
   ],[
     ac_cv_libmemcached="no"
   ])
   
+  AC_CACHE_CHECK([if libmemcached has memcached_server_fn],
+    [pandora_cv_libmemcached_server_fn],
+    [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+#include <libmemcached/memcached.h>
+memcached_server_fn callbacks[1];
+    ]])],
+    [pandora_cv_libmemcached_server_fn=yes],
+    [pandora_cv_libmemcached_server_fn=no])])
+  AS_IF([test "x$pandora_cv_libmemcached_server_fn" = "xyes"],[
+    AC_DEFINE([HAVE_MEMCACHED_SERVER_FN],[1],[If we have the new memcached_server_fn typedef])
+  ])
+
   AM_CONDITIONAL(HAVE_LIBMEMCACHED, [test "x${ac_cv_libmemcached}" = "xyes"])
   
 ])
@@ -41,3 +59,4 @@ AC_DEFUN([PANDORA_REQUIRE_LIBMEMCACHED],[
   AS_IF([test x$ac_cv_libmemcached = xno],
       AC_MSG_ERROR([libmemcached is required for ${PACKAGE}]))
 ])
+