Fix binary lookup

diff --git a/libtest/unittest.cc b/libtest/unittest.cc
index f8e1aa8c650b9f083854361d04a1aaa5ac923d73..0d50447783ce0c1278d6c07e1b072336ea7e4223 100644 (file)
--- a/libtest/unittest.cc
+++ b/libtest/unittest.cc
@@ -771,10 +771,10 @@ static test_return_t check_for_gearman(void *)
 {
   test_skip(true, HAVE_LIBGEARMAN);
   test_skip(true, has_gearmand());
-#if defined(GEARMAND_BINARY)
+#if defined(HAVE_GEARMAND_BINARY) && HAVE_GEARMAND_BINARY
   if (GEARMAND_BINARY)
   {
-    test_skip(0, access(GEARMAND_BINARY, X_OK ));
+    test_zero(access(GEARMAND_BINARY, X_OK ));
   }
   else
   {

diff --git a/m4/libgearman.m4 b/m4/libgearman.m4
index f4c5d3b0f3bb77b994c71e77749e81233fd5b7d1..3e3c96d3746c5c99babd0e2333996458f9721a66 100644 (file)
--- a/m4/libgearman.m4
+++ b/m4/libgearman.m4
@@ -1,4 +1,5 @@
 # serial 2
 AC_DEFUN([CHECK_FOR_LIBGEARMAND],
-    [AX_CHECK_LIBRARY([LIBGEARMAN],[libgearman/gearman.h],[gearman])
-    ])
+         [AX_CHECK_LIBRARY([LIBGEARMAN],[libgearman/gearman.h],[gearman],,
+                           [AC_DEFINE([HAVE_LIBGEARMAN],[0],[Define to 1 to compile in libgearman support])])
+         ])