From: Brian Aker <brian@tangent.org>
Date: Tue, 4 Dec 2012 11:18:01 +0000 (-0500)
Subject: Fix binary lookup
X-Git-Tag: 1.0.15~11^2
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=bf47365df496a7df349b5b2a14a2eb20956acb9e;p=m6w6%2Flibmemcached

Fix binary lookup
---

diff --git a/libtest/unittest.cc b/libtest/unittest.cc
index f8e1aa8c..0d504477 100644
--- 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 f4c5d3b0..3e3c96d3 100644
--- 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])])
+         ])