From: Ralf Wildenhues Date: Wed, 6 Jan 2010 19:26:04 +0000 (+0100) Subject: Don't fail autom4te preselection test due to different Automake. X-Git-Tag: v2.66~97 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=87ccb0b79ce93289a680cecf793cd96ca2ed4452;p=thirdparty%2Fautoconf.git 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 --- diff --git a/ChangeLog b/ChangeLog index d5fc01d4..c69b906b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2010-01-06 Ralf Wildenhues + + 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 Ralf Wildenhues diff --git a/THANKS b/THANKS index 16e2db38..8d91a642 100644 --- 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 73757d76..cea3a0fa 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