Merge lp:~tangent-org/libmemcached/1.0-build Build: jenkins-Libmemcached-1.0-149

[m6w6/libmemcached] / libtest / m4 / memcached.m4

diff --git a/libtest/m4/memcached.m4 b/libtest/m4/memcached.m4
index ac8068b35fdfdb796d2cafa022eb55349d1c87dd..42d949e8b0e5d8abeae825f51c231c0e30b1d5d5 100644 (file)
--- a/libtest/m4/memcached.m4
+++ b/libtest/m4/memcached.m4
@@ -1,11 +1,14 @@
-AX_PROG_MYSQLD
-AX_WITH_PROG(MEMCACHED_BINARY, [memcached])
-AS_IF([test -f "$ac_cv_path_MEMCACHED_BINARY"],
-      [
+#serial 1
+
+  AC_DEFUN([YATL_MEMCACHED], [
+      AC_REQUIRE([AX_ENABLE_LIBMEMCACHED])
+
+      AX_WITH_PROG(MEMCACHED_BINARY, [memcached])
+      AS_IF([test -f "$ac_cv_path_MEMCACHED_BINARY"],[
         AC_DEFINE([HAVE_MEMCACHED_BINARY], [1], [If Memcached binary is available])
         AC_DEFINE_UNQUOTED([MEMCACHED_BINARY], "$ac_cv_path_MEMCACHED_BINARY", [Name of the memcached binary used in make test])
-       ],
-       [
+        ],[
         AC_DEFINE([HAVE_MEMCACHED_BINARY], [1], [If Memcached binary is available])
         AC_DEFINE([MEMCACHED_BINARY], ["memcached/memcached"], [Name of the memcached binary used in make test])
+        ])
       ])