Merge lp:~trond-norbye/gearmand/bug_394169 into lp:gearmand/1.0

[Trond Norbye]

[Trond Norbye (trond-norbye)]

make test tries to start the memcached daemon by just executing memcached and expects it to be located in the PATH of the user. On some systems deamons are not installed in the users default path (they are not intended to be started from the command line by the average user), leading to a test failure

=== modified file 'configure.ac'
--- configure.ac	2009-06-21 12:17:46 +0000
+++ configure.ac	2009-07-01 08:29:17 +0000
@@ -242,6 +242,9 @@
 
 AM_CONDITIONAL(HAVE_LIBMEMCACHED, test x$ac_cv_libmemcached = xyes)
 
+AS_IF([test x$ac_cv_libmemcached = xyes],
+      [ WITH_MEMCACHED ])
+
 AC_CHECK_HEADERS(assert.h errno.h fcntl.h getopt.h netinet/tcp.h pwd.h signal.h)
 AC_CHECK_HEADERS(stdarg.h stddef.h stdio.h stdlib.h string.h)
 AC_CHECK_HEADERS(sys/resource.h sys/stat.h)

=== added file 'm4/memcached.m4'
--- m4/memcached.m4	1970-01-01 00:00:00 +0000
+++ m4/memcached.m4	2009-07-01 08:29:17 +0000
@@ -0,0 +1,27 @@
+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
+      MEMCACHED_BINARY=memcached
+    ],
+    [
+       AS_IF([test -f "$withval"],
+         [
+           ac_cv_with_memcached=$withval
+           MEMCACHED_BINARY=$withval
+         ], 
+         [
+           AC_PATH_PROG([MEMCACHED_BINARY], [$ac_cv_with_memcached], "no")
+           AS_IF([test "x$MEMCACHED_BINARY" = "xno"],
+             AC_MSG_ERROR(["could not find memcached binary"]))
+         ])
+    ])
+])

=== modified file 'tests/Makefile.am'
--- tests/Makefile.am	2009-07-01 01:40:21 +0000
+++ tests/Makefile.am	2009-07-01 08:29:17 +0000
@@ -7,7 +7,7 @@
 
 if HAVE_LIBMEMCACHED
 LIBMEMCACHED_TEST= memcached_test
-LIBMEMCACHED_SETUP= memcached -d -P /tmp/Xumemc.pid -p 12555
+LIBMEMCACHED_SETUP= $(MEMCACHED_BINARY) -d -P /tmp/Xumemc.pid -p 12555
 LIBMEMCACHED_TEARDOWN= cat /tmp/Xumemc.pid | xargs kill
 LIBMEMCACHED_RM= rm /tmp/Xumemc.pid
 LIBMEMCACHED_RES= memcached_test.res