X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libtest%2Fhas.cc;h=accadf9839bbf9a1973196d91d001dd1a79aff13;hb=f47caf2833675cce0b62a6e4ffd6764c1490a8b4;hp=ba4bbfc65efd6af1aa31db34f11c9b3141bfee99;hpb=363ba89b6954d2cdcc20f738b627499695e4aaf4;p=m6w6%2Flibmemcached

diff --git a/libtest/has.cc b/libtest/has.cc
index ba4bbfc6..accadf98 100644
--- a/libtest/has.cc
+++ b/libtest/has.cc
@@ -64,8 +64,10 @@ bool has_libdrizzle(void)
 
 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;
@@ -80,11 +82,14 @@ bool has_gearmand()
 {
   if (HAVE_GEARMAND_BINARY)
   {
+#if defined(HAVE_GEARMAND_BINARY) && 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;
@@ -93,6 +98,7 @@ bool has_gearmand()
     {
       return true;
     }
+#endif
   }
 
   return false;
@@ -100,6 +106,7 @@ bool has_gearmand()
 
 bool has_drizzled()
 {
+#if defined(HAVE_DRIZZLED_BINARY) && HAVE_DRIZZLED_BINARY
   if (HAVE_DRIZZLED_BINARY)
   {
     if (access(DRIZZLED_BINARY, X_OK) == 0)
@@ -107,12 +114,14 @@ bool has_drizzled()
       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)
@@ -120,6 +129,7 @@ bool has_mysqld()
       return true;
     }
   }
+#endif
 
   return false;
 }
@@ -130,9 +140,11 @@ bool has_memcached()
   {
     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;