Author: astitcher
Date: Mon Nov 30 06:21:49 2009
New Revision: 885339
URL: http://svn.apache.org/viewvc?rev=885339&view=rev
Log:
Fix autotool dependency on installed libtool for running "make check"
Modified:
qpid/trunk/qpid/cpp/src/tests/Makefile.am
qpid/trunk/qpid/cpp/src/tests/run_test
Modified: qpid/trunk/qpid/cpp/src/tests/Makefile.am
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/Makefile.am?rev=885339&r1=885338&r2=885339&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/Makefile.am (original)
+++ qpid/trunk/qpid/cpp/src/tests/Makefile.am Mon Nov 30 06:21:49 2009
@@ -279,6 +279,7 @@
TESTS_ENVIRONMENT = \
VALGRIND=$(VALGRIND) \
+ LIBTOOL="$(LIBTOOL)" \
srcdir=$(srcdir) \
top_builddir=$(top_builddir) \
QPID_DATA_DIR= \
Modified: qpid/trunk/qpid/cpp/src/tests/run_test
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/run_test?rev=885339&r1=885338&r2=885339&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/run_test (original)
+++ qpid/trunk/qpid/cpp/src/tests/run_test Mon Nov 30 06:21:49 2009
@@ -35,7 +35,7 @@
. $srcdir/vg_check
# Export variables from makefile.
-export VALGRIND srcdir
+export srcdir
# Set QPID_PORT if qpidd.port exists.
test -s qpidd.port && QPID_PORT=`cat qpidd.port`
@@ -67,7 +67,7 @@
# This is a libtool "executable". Valgrind it if VALGRIND specified.
test -n "$VALGRIND" && VALGRIND="$VALGRIND $VALGRIND_OPTS"
# Hide output unless there's an error.
- libtool --mode=execute $VALGRIND "$@" 2>&1 || ERROR=1
+ $LIBTOOL --mode=execute $VALGRIND "$@" 2>&1 || ERROR=1
test -n "$VALGRIND" && { vg_check $VG_LOG* || ERROR=1 ; }
else
# This is a non-libtool shell script, just execute it.
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:[email protected]
