projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Update for protocol (and a single fix).
[m6w6/libmemcached]
/
libtest
/
libtool.cc
diff --git
a/libtest/libtool.cc
b/libtest/libtool.cc
index c7aa29d7c818691280fedca09db2e0de3e869f9a..5beea9b96ce448b8d4b66ef549471cd765fda5e0 100644
(file)
--- a/
libtest/libtool.cc
+++ b/
libtest/libtool.cc
@@
-19,6
+19,7
@@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#include <config.h>
#include <libtest/common.h>
#include <string>
#include <libtest/common.h>
#include <string>
@@
-28,12
+29,12
@@
namespace libtest {
const char *libtool(void)
{
const char *libtool(void)
{
- if (_libtool[0])
+ if (_libtool[0]
== 0
)
{
std::string libtool_buffer;
{
std::string libtool_buffer;
- if (getenv("
srcdir
"))
+ if (getenv("
PWD
"))
{
{
- libtool_buffer+= getenv("
srcdir
");
+ libtool_buffer+= getenv("
PWD
");
libtool_buffer+= "/";
}
else
libtool_buffer+= "/";
}
else
@@
-44,15
+45,14
@@
const char *libtool(void)
libtool_buffer+= "libtool";
if (access(libtool_buffer.c_str(), R_OK | W_OK | X_OK))
{
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;
}
return NULL;
}
- libtool_buffer+= " --mode=execute ";
-
snprintf(_libtool, sizeof(_libtool), "%s", libtool_buffer.c_str());
}
return _libtool;
}
snprintf(_libtool, sizeof(_libtool), "%s", libtool_buffer.c_str());
}
return _libtool;
}
-}
+}
// namespace libtest