From: Monty Taylor Date: Sat, 2 Jan 2010 05:10:47 +0000 (-0800) Subject: Merged in pandora-build changes from gearman. X-Git-Tag: 0.37~32^2 X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=5acd86480dd1a74eb379bc0111884e5190626d90;p=m6w6%2Flibmemcached Merged in pandora-build changes from gearman. --- diff --git a/m4/pandora_canonical.m4 b/m4/pandora_canonical.m4 index cc945c1b..32574f98 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.91]) +AC_DEFUN([PANDORA_CANONICAL_VERSION],[0.92]) AC_DEFUN([PANDORA_FORCE_DEPEND_TRACKING],[ AC_ARG_ENABLE([fat-binaries], diff --git a/m4/pandora_with_memcached.m4 b/m4/pandora_with_memcached.m4 index 4aa1f2a0..81fc5955 100644 --- a/m4/pandora_with_memcached.m4 +++ b/m4/pandora_with_memcached.m4 @@ -25,6 +25,7 @@ AC_DEFUN([_PANDORA_SEARCH_MEMCACHED],[ ]) AC_DEFINE_UNQUOTED([MEMCACHED_BINARY], "$MEMCACHED_BINARY", [Name of the memcached binary used in make test]) + AM_CONDITIONAL([HAVE_MEMCACHED],[test "x$MEMCACHED_BINARY" != "xno"]) ]) AC_DEFUN([PANDORA_HAVE_MEMCACHED],[