From ab2154ec9b3c87fbd414176aeed0ccfebbb8bf2b Mon Sep 17 00:00:00 2001 From: Monty Taylor Date: Sat, 9 Jan 2010 22:27:43 -0800 Subject: [PATCH] Updated pandora-build. --- m4/pandora_canonical.m4 | 2 +- m4/pandora_have_libmemcached.m4 | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/m4/pandora_canonical.m4 b/m4/pandora_canonical.m4 index 32574f98..b9b3e455 100644 --- 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 0c028999..e8b3e3ef 100644 --- 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 + ],[ + struct memcached_protocol_st *protocol_handle= NULL; + 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 +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}])) ]) + -- 2.30.2