1999-10-31 Akim Demaille <akim@epita.fr>

	Allow standard beta version numbers.

	* configure.in: Declare version 2.14a.
	* acgeneral.m4 (AC_UNGNITS): New macro which transform version
	numbers to pure digits (2.14a to 2.14.0.1, 2.15z to 2.15.0.26
	etc.).
	(AC_PREREQ): Normalize argument and AC_ACVERSION via AC_UNGNITS.

diff --git a/ChangeLog b/ChangeLog
index f452f36c48365b81c2d9570fe04fa527d231f1ad..42707d03fa58b11da947c466dd429c83de694e7d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+1999-10-31  Akim Demaille  <akim@epita.fr>
+
+       Allow standard beta version numbers.
+
+       * configure.in: Declare version 2.14a.
+       * acgeneral.m4 (AC_UNGNITS): New macro which transform version
+       numbers to pure digits (2.14a to 2.14.0.1, 2.15z to 2.15.0.26
+       etc.).
+       (AC_PREREQ): Normalize argument and AC_ACVERSION via AC_UNGNITS.
+
 1999-10-31  Akim Demaille  <akim@epita.fr>
 
        Fix the --version of all the executables.

diff --git a/NEWS b/NEWS
index 82aa5ec52b60747f1d8c2a4ef1f8058f90ec665b..c56fa06359d27ba2a28e1d71088f331b694a98ab 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
-* Major changes in release 2.14.1                      -*- outline -*-
+* Major changes in release 2.14a                       -*- outline -*-
 
 ** config.status
 - much faster on most architectures

diff --git a/acgeneral.m4 b/acgeneral.m4
index b829aa65eaf2ef694d764440e081daf7da434ace..0b89bfcd14ede3c7ed0a87697e1a65d0a2d324f9 100644 (file)
--- a/acgeneral.m4
+++ b/acgeneral.m4
@@ -1544,14 +1544,34 @@ define(m4_compare,
                         [m4_compare(m4_quote(m4_shift($1)),
                                     m4_quote(m4_shift($2)))])])])])
 
-dnl Complain and exit if the Autoconf version is less than VERSION.
+
+dnl AC_UNGNITS(VERSION)
+dnl -------------------
+dnl Replace .a, .b etc. by .0.1, .0.2 in VERSION.  For instance, version
+dnl 2.14a is understood as 2.14.0.1 for version comparison.
+dnl This macro is absolutely not robust to active macro, it expects
+dnl reasonable version numbers.
+dnl Warning: Valid up to `z', no double letters.
+define(AC_UNGNITS,
+[translit(patsubst(patsubst(patsubst([$1],
+                                     [\([abcdefghi]\)], [.0.\1]),
+                            [\([jklmnopqrs]\)], [.0.1\1]),
+          [\([tuvwxyz]\)], [.0.2\1]),
+          abcdefghijklmnopqrstuvwxyz,
+          12345678901234567890123456)])
+
+
 dnl AC_PREREQ(VERSION)
+dnl ------------------
+dnl Complain and exit if the Autoconf version is less than VERSION.
 define(AC_PREREQ,
-[ifelse(m4_compare(m4_split([$1],         [\.]),
-                   m4_split(AC_ACVERSION, [\.])), -1,
+[ifelse(m4_compare(m4_split(AC_UNGNITS([$1]),         [\.]),
+                   m4_split(AC_UNGNITS(AC_ACVERSION), [\.])), -1,
        [AC_FATAL(Autoconf version $1 or higher is required for this script)])])
 
 
+
+
 dnl ### Getting the canonical system type
 
 

diff --git a/configure.in b/configure.in
index df2137f1f402cab87f3825590b95f03b5ade2f09..2b05c427f9e1d2a218dedab2363e21231993ef67 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_INIT(acgeneral.m4)
-AM_INIT_AUTOMAKE(autoconf, 2.14.1)
+AM_INIT_AUTOMAKE(autoconf, 2.14a)
 
 dnl We use a path for GNU m4 so even if users have another m4 first in
 dnl their path, the installer can configure with a path that has GNU m4

diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4
index b829aa65eaf2ef694d764440e081daf7da434ace..0b89bfcd14ede3c7ed0a87697e1a65d0a2d324f9 100644 (file)
--- a/lib/autoconf/general.m4
+++ b/lib/autoconf/general.m4
@@ -1544,14 +1544,34 @@ define(m4_compare,
                         [m4_compare(m4_quote(m4_shift($1)),
                                     m4_quote(m4_shift($2)))])])])])
 
-dnl Complain and exit if the Autoconf version is less than VERSION.
+
+dnl AC_UNGNITS(VERSION)
+dnl -------------------
+dnl Replace .a, .b etc. by .0.1, .0.2 in VERSION.  For instance, version
+dnl 2.14a is understood as 2.14.0.1 for version comparison.
+dnl This macro is absolutely not robust to active macro, it expects
+dnl reasonable version numbers.
+dnl Warning: Valid up to `z', no double letters.
+define(AC_UNGNITS,
+[translit(patsubst(patsubst(patsubst([$1],
+                                     [\([abcdefghi]\)], [.0.\1]),
+                            [\([jklmnopqrs]\)], [.0.1\1]),
+          [\([tuvwxyz]\)], [.0.2\1]),
+          abcdefghijklmnopqrstuvwxyz,
+          12345678901234567890123456)])
+
+
 dnl AC_PREREQ(VERSION)
+dnl ------------------
+dnl Complain and exit if the Autoconf version is less than VERSION.
 define(AC_PREREQ,
-[ifelse(m4_compare(m4_split([$1],         [\.]),
-                   m4_split(AC_ACVERSION, [\.])), -1,
+[ifelse(m4_compare(m4_split(AC_UNGNITS([$1]),         [\.]),
+                   m4_split(AC_UNGNITS(AC_ACVERSION), [\.])), -1,
        [AC_FATAL(Autoconf version $1 or higher is required for this script)])])
 
 
+
+
 dnl ### Getting the canonical system type