X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libtest%2Fhas.cc;h=9b26b96b675dab7d2fef408cdcf99e276553758c;hb=8926da4bfb40831308843eb75e7e665ad178eea8;hp=1c7b049306fcd179df18a44be8bad916ca9502f7;hpb=47f45992107361ad58c170bdf78fdc92523fab06;p=m6w6%2Flibmemcached

diff --git a/libtest/has.cc b/libtest/has.cc
index 1c7b0493..9b26b96b 100644
--- a/libtest/has.cc
+++ b/libtest/has.cc
@@ -34,36 +34,44 @@
  *
  */
 
-#include <config.h>
-#include <libtest/has.hpp>
+#include "libtest/yatlcon.h"
+#include <libtest/common.h>
 
 #include <cstdlib>
+#include <unistd.h>
 
-bool has_memcached_support(void)
+namespace libtest {
+
+bool has_libmemcached(void)
 {
-  if (HAVE_LIBMEMCACHED and HAVE_MEMCACHED_BINARY)
+#if defined(HAVE_LIBMEMCACHED) && HAVE_LIBMEMCACHED
+  if (HAVE_LIBMEMCACHED)
   {
     return true;
   }
+#endif
 
   return false;
 }
 
-bool has_drizzle_support(void)
+bool has_libdrizzle(void)
 {
-  if (HAVE_LIBDRIZZLE and HAVE_DRIZZLED_BINARY)
+#if defined(HAVE_LIBDRIZZLE) && HAVE_LIBDRIZZLE
+  if (HAVE_LIBDRIZZLE)
   {
     return true;
   }
+#endif
 
   return false;
 }
 
 bool has_postgres_support(void)
 {
-  if (getenv("POSTGES_IS_RUNNING_AND_SETUP"))
+  char *getenv_ptr;
+  if (bool((getenv_ptr= getenv("POSTGES_IS_RUNNING_AND_SETUP"))))
   {
-
+    (void)(getenv_ptr);
     if (HAVE_LIBPQ)
     {
       return true;
@@ -72,3 +80,103 @@ bool has_postgres_support(void)
 
   return false;
 }
+
+
+bool has_gearmand()
+{
+#if defined(HAVE_GEARMAND_BINARY) && HAVE_GEARMAND_BINARY
+  if (HAVE_GEARMAND_BINARY)
+  {
+    std::stringstream arg_buffer;
+
+    char *getenv_ptr;
+    if (bool((getenv_ptr= getenv("PWD"))) and 
+        ((strcmp(GEARMAND_BINARY, "./gearmand/gearmand") == 0) or (strcmp(GEARMAND_BINARY, "gearmand/gearmand") == 0)))
+    {
+      arg_buffer << getenv_ptr;
+      arg_buffer << "/";
+    }
+    arg_buffer << GEARMAND_BINARY;
+
+    if (access(arg_buffer.str().c_str(), X_OK) == 0)
+    {
+      return true;
+    }
+  }
+#endif
+
+  return false;
+}
+
+bool has_drizzled()
+{
+#if defined(HAVE_DRIZZLED_BINARY) && HAVE_DRIZZLED_BINARY
+  if (HAVE_DRIZZLED_BINARY)
+  {
+    if (access(DRIZZLED_BINARY, X_OK) == 0)
+    {
+      return true;
+    }
+  }
+#endif
+
+  return false;
+}
+
+bool has_mysqld()
+{
+#if defined(HAVE_MYSQLD_BUILD) && HAVE_MYSQLD_BUILD
+  if (HAVE_MYSQLD_BUILD)
+  {
+    if (access(MYSQLD_BINARY, X_OK) == 0)
+    {
+      return true;
+    }
+  }
+#endif
+
+  return false;
+}
+
+bool has_memcached()
+{
+#if defined(HAVE_MEMCACHED_BINARY) && HAVE_MEMCACHED_BINARY
+  if (HAVE_MEMCACHED_BINARY)
+  {
+    std::stringstream arg_buffer;
+
+
+    char *getenv_ptr;
+    if (bool((getenv_ptr= getenv("PWD"))) and strcmp(MEMCACHED_BINARY, "memcached/memcached") == 0)
+    {
+      arg_buffer << getenv_ptr;
+      arg_buffer << "/";
+    }
+    arg_buffer << MEMCACHED_BINARY;
+
+    if (access(arg_buffer.str().c_str(), X_OK) == 0)
+    {
+      return true;
+    }
+  }
+#endif
+
+  return false;
+}
+
+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)
+    {
+      return true;
+    }
+  }
+#endif
+
+  return false;
+}
+
+} // namespace libtest