Update for DNS updates from libtest

[m6w6/libmemcached] / m4 / memcached.m4

diff --git a/m4/memcached.m4 b/m4/memcached.m4
index 010fb42900de16b05c07b0572a062b4e74d29ed6..c33f1da2f8418737cc00aca6607df4c14c89bfc6 100644 (file)
--- a/m4/memcached.m4
+++ b/m4/memcached.m4
@@ -1,31 +1,10 @@
-AC_DEFUN([WITH_MEMCACHED],
-  [AC_ARG_WITH([memcached],
-    [AS_HELP_STRING([--with-memcached],
-      [Memcached binary to use for make test])],
-    [ac_cv_with_memcached="$withval"],
-    [ac_cv_with_memcached=memcached])
-
-  # just ignore the user if --without-memcached is passed.. it is
-  # only used by make test
-  AS_IF([test "x$withval" = "xno"],
-    [
-      ac_cv_with_memcached=memcached
-      MEMC_BINARY=memcached
-    ],
-    [
-       AS_IF([test -f "$withval"],
-         [
-           ac_cv_with_memcached=$withval
-           MEMC_BINARY=$withval
-         ],
-         [
-           AC_PATH_PROG([MEMC_BINARY], [$ac_cv_with_memcached], "no")
-           AS_IF([test "x$MEMC_BINARY" = "xno"],
-             AC_MSG_ERROR(["could not find memcached binary"]))
-         ])
-    ])
-
-  AC_DEFINE_UNQUOTED([MEMCACHED_BINARY], "$MEMC_BINARY",
-            [Name of the memcached binary used in make test])
-  AC_SUBST(MEMC_BINARY)
-])
+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])
+      ])