X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libtest%2Flibtool.cc;h=90f0035e5a5ffdd9ff62a05c079f6a245e9102f2;hb=751e342e158ae65052ce098ccd64aa54e39312db;hp=c7aa29d7c818691280fedca09db2e0de3e869f9a;hpb=fabf488ffa687540145ca8973ceb3fb0147a858b;p=awesomized%2Flibmemcached diff --git a/libtest/libtool.cc b/libtest/libtool.cc index c7aa29d7..90f0035e 100644 --- a/libtest/libtool.cc +++ b/libtest/libtool.cc @@ -28,12 +28,12 @@ namespace libtest { const char *libtool(void) { - if (_libtool[0]) + if (_libtool[0] == 0) { std::string libtool_buffer; - if (getenv("srcdir")) + if (getenv("PWD")) { - libtool_buffer+= getenv("srcdir"); + libtool_buffer+= getenv("PWD"); libtool_buffer+= "/"; } else @@ -44,15 +44,14 @@ const char *libtool(void) libtool_buffer+= "libtool"; if (access(libtool_buffer.c_str(), R_OK | W_OK | X_OK)) { + Error << "Could not find libtool via access(" << libtool_buffer << ") :" << strerror(errno); return NULL; } - libtool_buffer+= " --mode=execute "; - snprintf(_libtool, sizeof(_libtool), "%s", libtool_buffer.c_str()); } return _libtool; } -} +} // namespace libtest