Fix server messages (clean up errors in general).

[m6w6/libmemcached] / libtest / has.cc

diff --git a/libtest/has.cc b/libtest/has.cc
index 699a1326a4364b96b46b78ed492d26277beed345..7cc933704bbfa5cd6d3d20bb6c07a971cfc4c89a 100644 (file)
--- 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)
   {
@@ -115,10 +115,21 @@ 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;
+
+    std::cout << "Value: " << arg_buffer.str() << std::endl;
+    if (access(arg_buffer.str().c_str(), X_OK) == 0)
     {
       return true;
     }
+    std::cout << "Access was not 0 : " << strerror(errno) << std::endl;
   }
 
   return false;