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 <Ralf.Wildenhues@gmx.de>

diff --git a/ChangeLog b/ChangeLog
index d5fc01d49cefd50775c7ea260d207ad95090b7c0..c69b906b54fd20d336b94826ed0f3a0e3fefe004 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2010-01-06  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+       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  <peb@mppmu.mpg.de>
            Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 

diff --git a/THANKS b/THANKS
index 16e2db38beaeccf79e458b75b88d6e1e9381ee1f..8d91a642b5cc7533b4ddaf13c15d9f2db5e1ee1a 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -104,6 +104,7 @@ Dennis J. Linse             ?
 Derek R. Price              derek.price@openavenue.com
 Didier Desseaux             didess@infonie.fr
 Didier Verna                didier@xemacs.org
+Dieter Jurzitza             dieter.jurzitza@t-online.de
 Dietmar P. Schindler        schd@mra.man.de
 Dmitry Grebeniuk            gdsfh1@gmail.com
 Doug Evans                  dje@canuck.cygnus.com

diff --git a/tests/tools.at b/tests/tools.at
index 73757d766c94ccbac48e0f112a1c8d6cfdca0dd9..cea3a0fa6cbf2f63139f133e4f0520faaab4a60f 100644 (file)
--- 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