X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=m4%2Fmemcached.m4;h=010fb42900de16b05c07b0572a062b4e74d29ed6;hb=7b7b8c93445a962375b17f1b22d1fb1b1f693484;hp=0916bb69e51a4e802f7fac6be8d4cf0ddaaa9079;hpb=faeaf00cde273a2a01c4220b404c45e91524538f;p=awesomized%2Flibmemcached

diff --git a/m4/memcached.m4 b/m4/memcached.m4
index 0916bb69..010fb429 100644
--- a/m4/memcached.m4
+++ b/m4/memcached.m4
@@ -1,32 +1,31 @@
-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
+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
-  if test x$withval = xno
-  then
-    MEMC_BINARY=memcached
-  fi
-],
-[
-   AC_PATH_PROG([MEMC_BINARY], [memcached], "no", [$PATH])
-])
+  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"]))
+         ])
+    ])
 
-if test x$MEMC_BINARY = "xno"
-then
-  AC_MSG_ERROR(["could not find memcached binary"])
-fi
-
-AC_DEFINE_UNQUOTED([MEMCACHED_BINARY], "$MEMC_BINARY", 
+  AC_DEFINE_UNQUOTED([MEMCACHED_BINARY], "$MEMC_BINARY",
             [Name of the memcached binary used in make test])
+  AC_SUBST(MEMC_BINARY)
+])