Update for DNS updates from libtest

[m6w6/libmemcached] / m4 / memcached.m4

diff --git a/m4/memcached.m4 b/m4/memcached.m4
index 0916bb69e51a4e802f7fac6be8d4cf0ddaaa9079..c33f1da2f8418737cc00aca6607df4c14c89bfc6 100644 (file)
--- a/m4/memcached.m4
+++ b/m4/memcached.m4
@@ -1,32 +1,10 @@
-AC_ARG_WITH(memcached,
-[[  --with-memcached[=memcached binary]
-                          Memcached binary to use for make test]],
-[
-  if test -n "$withval"
-  then
-    MEMC_BINARY="$withval"
-  fi
-
-  if test x$withval = xyes
-  then
-    MEMC_BINARY=memcached
-  fi
-
-  # just ignore the user if --without-memcached is passed.. it is
-  # only used by make test
-  if test x$withval = xno
-  then
-    MEMC_BINARY=memcached
-  fi
-],
-[
-   AC_PATH_PROG([MEMC_BINARY], [memcached], "no", [$PATH])
-])
-
-if test x$MEMC_BINARY = "xno"
-then
-  AC_MSG_ERROR(["could not find memcached binary"])
-fi
-
-AC_DEFINE_UNQUOTED([MEMCACHED_BINARY], "$MEMC_BINARY", 
-            [Name of the memcached binary used in make test])
+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])
+      ])