automake-patches
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

FYI: fix for "require version 1.6.1, but have 1.6.1".


From: Alexandre Duret-Lutz
Subject: FYI: fix for "require version 1.6.1, but have 1.6.1".
Date: 13 Apr 2002 21:48:08 +0200
User-agent: Gnus/5.0808 (Gnus v5.8.8) Emacs/20.7

How embarrassing.  

The error message in the subject is simply triggered by
  AUTOMAKE_OPTIONS = 1.6.1

I'm checking in the following.

2002-04-13  Alexandre Duret-Lutz  <address@hidden>

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

Index: automake.in
===================================================================
RCS file: /cvs/automake/automake/automake.in,v
retrieving revision 1.1287
diff -u -r1.1287 automake.in
--- automake.in 30 Mar 2002 00:31:43 -0000      1.1287
+++ automake.in 13 Apr 2002 19:45:13 -0000
@@ -1467,7 +1467,7 @@
     return 1
        if ($required[4] ne '' && $required[4] ne $version[4]);
 
-    return 0 >= version_compare @version, @required;
+    return 0 > version_compare @version, @required;
 }
 
 # $BOOL
Index: tests/Makefile.am
===================================================================
RCS file: /cvs/automake/automake/tests/Makefile.am,v
retrieving revision 1.385
diff -u -r1.385 Makefile.am
--- tests/Makefile.am   2 Apr 2002 13:33:44 -0000       1.385
+++ tests/Makefile.am   13 Apr 2002 19:45:24 -0000
@@ -355,6 +355,7 @@
 version3.test \
 version4.test \
 version5.test \
+version6.test \
 vpath.test \
 vtexi.test \
 vtexi2.test \
Index: tests/version6.test
===================================================================
RCS file: tests/version6.test
diff -N tests/version6.test
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ tests/version6.test 13 Apr 2002 19:45:25 -0000
@@ -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

-- 
Alexandre Duret-Lutz




reply via email to

[Prev in Thread] Current Thread [Next in Thread]