Merge lp:~tangent-org/libmemcached/1.0-build/ Build: jenkins-Libmemcached-235

[awesomized/libmemcached] / libtest / has.cc

diff --git a/libtest/has.cc b/libtest/has.cc
index 72441819552e24315858192afe3d81e67f9d2918..9b26b96b675dab7d2fef408cdcf99e276553758c 100644 (file)
--- a/libtest/has.cc
+++ b/libtest/has.cc
@@ -34,7 +34,7 @@
  *
  */
 
-#include <config.h>
+#include "libtest/yatlcon.h"
 #include <libtest/common.h>
 
 #include <cstdlib>
@@ -44,28 +44,34 @@ namespace libtest {
 
 bool has_libmemcached(void)
 {
+#if defined(HAVE_LIBMEMCACHED) && HAVE_LIBMEMCACHED
   if (HAVE_LIBMEMCACHED)
   {
     return true;
   }
+#endif
 
   return false;
 }
 
 bool has_libdrizzle(void)
 {
+#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;
@@ -78,13 +84,16 @@ bool has_postgres_support(void)
 
 bool has_gearmand()
 {
+#if defined(HAVE_GEARMAND_BINARY) && HAVE_GEARMAND_BINARY
   if (HAVE_GEARMAND_BINARY)
   {
     std::stringstream arg_buffer;
 
-    if (getenv("PWD") and strcmp(MEMCACHED_BINARY, "gearmand/gearmand") == 0)
+    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("PWD");
+      arg_buffer << getenv_ptr;
       arg_buffer << "/";
     }
     arg_buffer << GEARMAND_BINARY;
@@ -94,12 +103,14 @@ bool has_gearmand()
       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)
@@ -107,16 +118,17 @@ bool has_drizzled()
       return true;
     }
   }
+#endif
 
   return false;
 }
 
 bool has_mysqld()
 {
-#if defined(HAVE_MYSQL_BUILD) && HAVE_MYSQL_BUILD
-  if (HAVE_MYSQL_BUILD)
+#if defined(HAVE_MYSQLD_BUILD) && HAVE_MYSQLD_BUILD
+  if (HAVE_MYSQLD_BUILD)
   {
-    if (access(HAVE_MYSQL, X_OK) == 0)
+    if (access(MYSQLD_BINARY, X_OK) == 0)
     {
       return true;
     }
@@ -128,13 +140,16 @@ bool has_mysqld()
 
 bool has_memcached()
 {
+#if defined(HAVE_MEMCACHED_BINARY) && HAVE_MEMCACHED_BINARY
   if (HAVE_MEMCACHED_BINARY)
   {
     std::stringstream arg_buffer;
 
-    if (getenv("PWD") and strcmp(MEMCACHED_BINARY, "memcached/memcached") == 0)
+
+    char *getenv_ptr;
+    if (bool((getenv_ptr= getenv("PWD"))) and strcmp(MEMCACHED_BINARY, "memcached/memcached") == 0)
     {
-      arg_buffer << getenv("PWD");
+      arg_buffer << getenv_ptr;
       arg_buffer << "/";
     }
     arg_buffer << MEMCACHED_BINARY;
@@ -144,6 +159,7 @@ bool has_memcached()
       return true;
     }
   }
+#endif
 
   return false;
 }