From: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Date: Fri, 10 Dec 2010 06:39:04 +0000 (+0100)
Subject: Avoid running installed automake from 'libtool --help'.
X-Git-Tag: v1.11.1b~39^2~10
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4abf2246375e96b8a82affdf04f079e3e9ee7c73;p=thirdparty%2Fautomake.git

Avoid running installed automake from 'libtool --help'.

* tests/subobj9.test: Export AUTOCONF and AUTOMAKE.
Together with fixed Libtool, this fixes check-coverage to not
invoke installed automake.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
---

diff --git a/ChangeLog b/ChangeLog
index e8864f125..5afdc53e6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-12-10  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+	Avoid running installed automake from 'libtool --help'.
+	* tests/subobj9.test: Export AUTOCONF and AUTOMAKE.
+	Together with fixed Libtool, this fixes check-coverage to not
+	invoke installed automake.
+
 2010-11-25  Stefano Lattarini  <stefano.lattarini@gmail.com>
 
 	Fix spurious failures in `silent*.test' for $CC != gcc
diff --git a/tests/subobj9.test b/tests/subobj9.test
index 2045d58e9..83f3a31ef 100755
--- a/tests/subobj9.test
+++ b/tests/subobj9.test
@@ -64,6 +64,9 @@ $AUTOMAKE -a
 # Skip this test on configure errors (e.g., broken C++ compilers).
 ./configure || Exit 77
 
+# Ensure './libtool --help' will use the right tool versions.
+export AUTOCONF AUTOMAKE
+
 # Opportunistically check that --tag=CXX is used when supported.
 if ./libtool --help | grep tag=TAG; then
   $MAKE print >stdout || { cat stdout; Exit 1; }