From 6e6fc823a301f7d226172c7aa9d40094e610e6ec Mon Sep 17 00:00:00 2001 From: Alexandre Duret-Lutz Date: Sat, 13 Apr 2002 19:59:22 +0000 Subject: [PATCH] * tests/version6.test: New file. * tests/Makefile.am (TESTS): Add tests/version6.test. * automake.in (version_check): Return 0 on equality. --- ChangeLog | 24 ++++++------------------ automake.in | 2 +- tests/Makefile.am | 1 + tests/Makefile.in | 1 + tests/version6.test | 16 ++++++++++++++++ 5 files changed, 25 insertions(+), 19 deletions(-) create mode 100755 tests/version6.test diff --git a/ChangeLog b/ChangeLog index b903164c..12c3c16e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,25 +1,13 @@ +2002-04-13 Alexandre Duret-Lutz + + * tests/version6.test: New file. + * tests/Makefile.am (TESTS): Add tests/version6.test. + * automake.in (version_check): Return 0 on equality. + 2002-04-13 Andreas Schwab * THANKS: Update my mail address. ---- ChangeLog 2002-03-29 16:02:58.000000000 +0100 -+++ ChangeLog 2002-04-12 14:56:24.000000000 +0200 -@@ -11,7 +11,7 @@ - Alexander V. Lukyanov lav@yars.free.net - Alexandre Duret-Lutz duret_g@epita.fr - Alexey Mahotkin alexm@hsys.msk.ru --Andreas Schwab schwab@lamothe.informatik.uni-dortmund.de -+Andreas Schwab schwab@suse.de - Andrew Cagney cagney@tpgi.com.au - Andris Pavenis pavenis@lanet.lv - Angus Leeming a.leeming@ic.ac.uk - --- -Andreas Schwab, SuSE Labs, schwab@suse.de -SuSE GmbH, Deutschherrnstr. 15-19, D-90429 Nürnberg -Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 -"And now for something completely different." - 2002-04-12 Alexandre Duret-Lutz * tests/discover.test: Use a full configure.in that calls AC_INIT. diff --git a/automake.in b/automake.in index 4f5cc2fc..322cb886 100755 --- a/automake.in +++ b/automake.in @@ -1467,7 +1467,7 @@ sub version_check ($) return 1 if ($required[4] ne '' && $required[4] ne $version[4]); - return 0 >= version_compare @version, @required; + return 0 > version_compare @version, @required; } # $BOOL diff --git a/tests/Makefile.am b/tests/Makefile.am index 41558744..24a528e0 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -352,6 +352,7 @@ version2.test \ version3.test \ version4.test \ version5.test \ +version6.test \ vpath.test \ vtexi.test \ vtexi2.test \ diff --git a/tests/Makefile.in b/tests/Makefile.in index fd653f13..39b071f6 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -442,6 +442,7 @@ version2.test \ version3.test \ version4.test \ version5.test \ +version6.test \ vpath.test \ vtexi.test \ vtexi2.test \ diff --git a/tests/version6.test b/tests/version6.test new file mode 100755 index 00000000..e391f60b --- /dev/null +++ b/tests/version6.test @@ -0,0 +1,16 @@ +#! /bin/sh + +# Make sure the current version can be required. + +. $srcdir/defs || exit 1 + +set -e + +amver=`$AUTOMAKE --version | sed -e 's/.* //;1q'` + +cat > Makefile.am << END +AUTOMAKE_OPTIONS = $amver +END + +$ACLOCAL +$AUTOMAKE -- 2.43.5