Free port logic

[m6w6/libmemcached] / libtest / binaries.cc

diff --git a/libtest/binaries.cc b/libtest/binaries.cc
index 00a897660f5dbc2ae421d4f776467441e9a9b20d..33cde3b74700b4544e5a748e227213d068532189 100644 (file)
--- a/libtest/binaries.cc
+++ b/libtest/binaries.cc
@@ -27,7 +27,16 @@ namespace libtest {
 bool has_gearmand_binary()
 {
 #if defined(HAVE_GEARMAND_BINARY) && HAVE_GEARMAND_BINARY
-  if (access(GEARMAND_BINARY,R_OK|X_OK) == 0)
+  std::stringstream arg_buffer;
+
+  if (getenv("PWD"))
+  {
+    arg_buffer << getenv("PWD");
+    arg_buffer << "/";
+  }
+  arg_buffer << GEARMAND_BINARY;
+
+  if (access(arg_buffer.str().c_str() ,R_OK|X_OK) == 0)
   {
     return true;
   }