[SCM] GNU Autoconf source repository branch, master, updated. v2.65-24-g87ccb0b

[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 Autoconf source repository".

http://git.sv.gnu.org/gitweb/?p=autoconf.git;a=commitdiff;h=87ccb0b79ce93289a680cecf793cd96ca2ed4452

The branch, master has been updated
       via  87ccb0b79ce93289a680cecf793cd96ca2ed4452 (commit)
      from  13e3570bc9cd43f2a036adb45497c96da65331e0 (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 87ccb0b79ce93289a680cecf793cd96ca2ed4452
Author: Ralf Wildenhues <address@hidden>
Date:   Wed Jan 6 20:26:04 2010 +0100

    Don't fail autom4te preselection test due to different Automake.
    
    * tests/tools.at (autom4te preselections): If the cache test
    fails, extract the Automake version from the toplevel
    Makefile.in file of the source tree; skip, rather than fail
    the test group if the automake program has a different version.
    * THANKS: Update.
    Report by Dieter Jurzitza, fix suggested by Eric Blake.
    
    Signed-off-by: Ralf Wildenhues <address@hidden>

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

Summary of changes:
 ChangeLog      |   10 ++++++++++
 THANKS         |    1 +
 tests/tools.at |    9 +++++++--
 3 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index d5fc01d..c69b906 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2010-01-06  Ralf Wildenhues  <address@hidden>
+
+       Don't fail autom4te preselection test due to different Automake.
+       * tests/tools.at (autom4te preselections): If the cache test
+       fails, extract the Automake version from the toplevel
+       Makefile.in file of the source tree; skip, rather than fail
+       the test group if the automake program has a different version.
+       * THANKS: Update.
+       Report by Dieter Jurzitza, fix suggested by Eric Blake.
+
 2010-01-06  Peter Breitenlohner  <address@hidden>
            Ralf Wildenhues  <address@hidden>
 
diff --git a/THANKS b/THANKS
index 16e2db3..8d91a64 100644
--- a/THANKS
+++ b/THANKS
@@ -104,6 +104,7 @@ Dennis J. Linse             ?
 Derek R. Price              address@hidden
 Didier Desseaux             address@hidden
 Didier Verna                address@hidden
+Dieter Jurzitza             address@hidden
 Dietmar P. Schindler        address@hidden
 Dmitry Grebeniuk            address@hidden
 Doug Evans                  address@hidden
diff --git a/tests/tools.at b/tests/tools.at
index 73757d7..cea3a0f 100644
--- a/tests/tools.at
+++ b/tests/tools.at
@@ -1197,8 +1197,13 @@ AT_CHECK([aclocal], [], [], [ignore])
 AT_CHECK([automake --no-force --add-missing], [], [], [ignore])
 AT_CHECK([autoconf])
 AT_CHECK([test "`find configure -newer newer`" = "" ||
-         { diff old-requests autom4te.cache/requests; exit 1; }])
-
+         { diff old-requests autom4te.cache/requests; exit 1; }],
+        [], [], [],
+        [extract_version=['s/^[^0-9]*\([0-9][^ ]*\).*/\1/;q']
+         automake_version=`automake --version | sed "$extract_version"`
+         used_automake_version=`sed "$extract_version" 
"$abs_top_srcdir/Makefile.in"`
+         AT_CHECK([if test "$automake_version" = "$used_automake_version"; ]dnl
+                   [then exit 1; else exit 77; fi])])
 AT_CLEANUP
 
 


hooks/post-receive
-- 
GNU Autoconf source repository