Merged in pandora-build changes from gearman.

diff --git a/m4/pandora_canonical.m4 b/m4/pandora_canonical.m4
index cc945c1bacde480cd689cfc168aee637e7501abf..32574f98f899d00838994a8cb8f9c787e45aa835 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
 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],
 
 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 4aa1f2a02fe06e94296e83870ae2595e2686d1d0..81fc5955dcc82998bdc5d520420c07a25a6f7e48 100644 (file)
--- 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])
   ])
   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],[
 ])
 
 AC_DEFUN([PANDORA_HAVE_MEMCACHED],[