* tests/version6.test: New file.

* tests/Makefile.am (TESTS): Add tests/version6.test.
* automake.in (version_check): Return 0 on equality.

diff --git a/ChangeLog b/ChangeLog
index b903164c2b96af4e47361f1f6cff1cbc6ee90e9d..12c3c16e231876c887d66d8f6ec73d65f4bcbd49 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,25 +1,13 @@
+2002-04-13  Alexandre Duret-Lutz  <duret_g@epita.fr>
+
+       * 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  <schwab@suse.de>
 
        * 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  <duret_g@epita.fr>
 
        * tests/discover.test: Use a full configure.in that calls AC_INIT.

diff --git a/automake.in b/automake.in
index 4f5cc2fcccf7059fef6b9a39345d510a4ea1f2ca..322cb88680f1d35c1af52a3585a4cc3f35d548aa 100755 (executable)
--- 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 415587445d1e83b1b9f096b516223bfcd7e5e181..24a528e07a08aaa370ab04a549f3f4c27ccd90ce 100644 (file)
--- 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 fd653f13ba70e4ab8e625cce2d0bb905ad0c4d90..39b071f6c626cdbc770794217b55d25c95f963cd 100644 (file)
--- 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 (executable)
index 0000000..e391f60
--- /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