[Automake-commit] [SCM] GNU Automake branch, maint, updated. v1.11-248-g4abf224

[Ralf Wildenhues]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Automake".

http://git.sv.gnu.org/gitweb/?p=automake.git;a=commitdiff;h=4abf2246375e96b8a82affdf04f079e3e9ee7c73

The branch, maint has been updated
       via  4abf2246375e96b8a82affdf04f079e3e9ee7c73 (commit)
      from  fdb2764f70ff5f3aed51a61baf3b72511ffb9d11 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 4abf2246375e96b8a82affdf04f079e3e9ee7c73
Author: Ralf Wildenhues <address@hidden>
Date:   Fri Dec 10 07:39:04 2010 +0100

    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 <address@hidden>

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog          |    7 +++++++
 tests/subobj9.test |    3 +++
 2 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index e8864f1..5afdc53 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-12-10  Ralf Wildenhues  <address@hidden>
+
+       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  <address@hidden>
 
        Fix spurious failures in `silent*.test' for $CC != gcc
diff --git a/tests/subobj9.test b/tests/subobj9.test
index 2045d58..83f3a31 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; }


hooks/post-receive
-- 
GNU Automake