X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libtest%2Fhas.cc;h=72441819552e24315858192afe3d81e67f9d2918;hb=7d698ad128550cb4d2e3a60c83533c4370efd106;hp=699a1326a4364b96b46b78ed492d26277beed345;hpb=ab130c459a975d24628169901addb191ef2cdf87;p=m6w6%2Flibmemcached

diff --git a/libtest/has.cc b/libtest/has.cc
index 699a1326..72441819 100644
--- a/libtest/has.cc
+++ b/libtest/has.cc
@@ -42,7 +42,7 @@
 
 namespace libtest {
 
-bool has_memcached_support(void)
+bool has_libmemcached(void)
 {
   if (HAVE_LIBMEMCACHED)
   {
@@ -82,7 +82,7 @@ bool has_gearmand()
   {
     std::stringstream arg_buffer;
 
-    if (getenv("PWD"))
+    if (getenv("PWD") and strcmp(MEMCACHED_BINARY, "gearmand/gearmand") == 0)
     {
       arg_buffer << getenv("PWD");
       arg_buffer << "/";
@@ -111,11 +111,35 @@ bool has_drizzled()
   return false;
 }
 
+bool has_mysqld()
+{
+#if defined(HAVE_MYSQL_BUILD) && HAVE_MYSQL_BUILD
+  if (HAVE_MYSQL_BUILD)
+  {
+    if (access(HAVE_MYSQL, X_OK) == 0)
+    {
+      return true;
+    }
+  }
+#endif
+
+  return false;
+}
+
 bool has_memcached()
 {
   if (HAVE_MEMCACHED_BINARY)
   {
-    if (access(MEMCACHED_BINARY, X_OK) == 0)
+    std::stringstream arg_buffer;
+
+    if (getenv("PWD") and strcmp(MEMCACHED_BINARY, "memcached/memcached") == 0)
+    {
+      arg_buffer << getenv("PWD");
+      arg_buffer << "/";
+    }
+    arg_buffer << MEMCACHED_BINARY;
+
+    if (access(arg_buffer.str().c_str(), X_OK) == 0)
     {
       return true;
     }
@@ -126,6 +150,7 @@ bool has_memcached()
 
 bool has_memcached_sasl()
 {
+#if defined(HAVE_MEMCACHED_SASL_BINARY) && HAVE_MEMCACHED_SASL_BINARY
   if (HAVE_MEMCACHED_SASL_BINARY)
   {
     if (access(MEMCACHED_SASL_BINARY, X_OK) == 0)
@@ -133,6 +158,7 @@ bool has_memcached_sasl()
       return true;
     }
   }
+#endif
 
   return false;
 }