From: Akim Demaille Date: Mon, 10 Jan 2000 10:13:42 +0000 (+0000) Subject: 1999-10-31 Akim Demaille X-Git-Tag: autoconf-2.50~1290 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2d7beaf15d7b862081ad09354dbd84d29e9a0496;p=thirdparty%2Fautoconf.git 1999-10-31 Akim Demaille 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 f452f36c4..42707d03f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +1999-10-31 Akim Demaille + + 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 Fix the --version of all the executables. diff --git a/NEWS b/NEWS index 82aa5ec52..c56fa0635 100644 --- 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 b829aa65e..0b89bfcd1 100644 --- 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 df2137f1f..2b05c427f 100644 --- 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 b829aa65e..0b89bfcd1 100644 --- 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