X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libtest%2Fhas.cc;h=1e020a20047da1301c492dcb923ec95e302975c1;hb=ad5cb8f903869065c72bb18bf98af6909189a5a9;hp=accadf9839bbf9a1973196d91d001dd1a79aff13;hpb=fed85d3c429c3881cd378d10e4dccd30f4fd2478;p=awesomized%2Flibmemcached

diff --git a/libtest/has.cc b/libtest/has.cc
index accadf98..1e020a20 100644
--- a/libtest/has.cc
+++ b/libtest/has.cc
@@ -34,7 +34,7 @@
  *
  */
 
-#include <config.h>
+#include "mem_config.h"
 #include <libtest/common.h>
 
 #include <cstdlib>
@@ -44,20 +44,24 @@ 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;
 }
@@ -80,9 +84,9 @@ bool has_postgres_support(void)
 
 bool has_gearmand()
 {
+#if defined(HAVE_GEARMAND_BINARY) && HAVE_GEARMAND_BINARY
   if (HAVE_GEARMAND_BINARY)
   {
-#if defined(HAVE_GEARMAND_BINARY) && HAVE_GEARMAND_BINARY
     std::stringstream arg_buffer;
 
     char *getenv_ptr;
@@ -98,8 +102,8 @@ bool has_gearmand()
     {
       return true;
     }
-#endif
   }
+#endif
 
   return false;
 }
@@ -136,6 +140,7 @@ bool has_mysqld()
 
 bool has_memcached()
 {
+#if defined(HAVE_MEMCACHED_BINARY) && HAVE_MEMCACHED_BINARY
   if (HAVE_MEMCACHED_BINARY)
   {
     std::stringstream arg_buffer;
@@ -154,6 +159,7 @@ bool has_memcached()
       return true;
     }
   }
+#endif
 
   return false;
 }