X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=m4%2Fmemcached.m4;h=c33f1da2f8418737cc00aca6607df4c14c89bfc6;hb=1e8bc3cb173d8b4e206363de7fdabeddb32d0f53;hp=0efa589d7bfc8caf80cccd2d0414fe450509b77f;hpb=34fc4157bda6f458cc603cf32c93507dab9c4f8a;p=m6w6%2Flibmemcached

diff --git a/m4/memcached.m4 b/m4/memcached.m4
index 0efa589d..c33f1da2 100644
--- a/m4/memcached.m4
+++ b/m4/memcached.m4
@@ -1,20 +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])
-
-  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])
-])
+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])
+      ])