Detect the availability of MSG_NOSIGNAL/MSG_DONTWAIT

[m6w6/libmemcached] / m4 / memcached.m4

diff --git a/m4/memcached.m4 b/m4/memcached.m4
index 0efa589d7bfc8caf80cccd2d0414fe450509b77f..010fb42900de16b05c07b0572a062b4e74d29ed6 100644 (file)
--- a/m4/memcached.m4
+++ b/m4/memcached.m4
@@ -8,13 +8,24 @@ AC_DEFUN([WITH_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_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", 
+  AC_DEFINE_UNQUOTED([MEMCACHED_BINARY], "$MEMC_BINARY",
             [Name of the memcached binary used in make test])
+  AC_SUBST(MEMC_BINARY)
 ])