X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libtest%2Flibtool.cc;h=64371eae3bb36e338cb6073acefbf4472b45efd9;hb=47f45992107361ad58c170bdf78fdc92523fab06;hp=c7aa29d7c818691280fedca09db2e0de3e869f9a;hpb=5d66b2f99bf7de6f54a3e463b01542b997f68ac8;p=m6w6%2Flibmemcached

diff --git a/libtest/libtool.cc b/libtest/libtool.cc
index c7aa29d7..64371eae 100644
--- a/libtest/libtool.cc
+++ b/libtest/libtool.cc
@@ -1,24 +1,40 @@
 /*  vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
- * 
- *  libtest
  *
- *  Copyright (C) 2011 Data Differential, http://datadifferential.com/
+ *  Data Differential YATL (i.e. libtest)  library
  *
- *  This library is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Lesser General Public
- *  License as published by the Free Software Foundation; either
- *  version 3 of the License, or (at your option) any later version.
+ *  Copyright (C) 2012 Data Differential, http://datadifferential.com/
  *
- *  This library is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *  Lesser General Public License for more details.
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are
+ *  met:
+ *
+ *      * Redistributions of source code must retain the above copyright
+ *  notice, this list of conditions and the following disclaimer.
+ *
+ *      * Redistributions in binary form must reproduce the above
+ *  copyright notice, this list of conditions and the following disclaimer
+ *  in the documentation and/or other materials provided with the
+ *  distribution.
+ *
+ *      * The names of its contributors may not be used to endorse or
+ *  promote products derived from this software without specific prior
+ *  written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ *  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ *  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ *  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ *  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ *  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; if not, write to the Free Software
- *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#include <config.h>
 #include <libtest/common.h>
 #include <string>
 
@@ -28,12 +44,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 +60,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