Merged up with build.

diff --git a/libmemcached/include.am b/libmemcached/include.am
index 8adde9f033fefcd6ddfd1edf6ccfe566e4ea9699..50fcea692fdf98f0915d7439905c7939d07f6566 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 \

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}]))
 ])
+