[ng] maint: bump version, for better compatibility with mainstream automake

Having a version number of '0.5a' for Automake-NG, while somewhat more
correct and "honest" (see comments in commit 'v1.11-2001-g2684923' of
17-02-2012 for more details), is also more problematic, in that it makes
more difficult to adapt a project using mainstream Automake to the use of
Automake-NG.  And alas, this difficulty cannot always be solved simply by
downgrading the required version number in AM_INIT_AUTOMAKE (as we had
naively thought originally); for example, Makefile.am fragments generated
by Gnulib will usually have a required version number of '1.5' hard-coded
in AUTOMAKE_OPTIONS, so that many Gnulib client would be prevented from
switching to Automake-NG (or they should be forced to put greater efforts
in the conversion, e.g., by adding hacks that post-process the Gnulib
generated Makefile.am).  And of course, other third-party tools might
have similar issues.

So, to avoid a plethora of potential spurious issues and breakages due
only to version number incompatibilities, we change the Automake-NG
version number again to closely track the one in the 'master' branch of
mainstream Automake.  Practicality beats purity.

Also, this "equal version" policy should be enough to avoid giving the
wrong impressions that Automake-NG is somehow meant to obsolete or
supersede mainstream Automake, which some automake users would consider
a sort of "abuse":
<http://lists.gnu.org/archive/html/automake-ng/2012-02/msg00024.html>

* configure.ac (AC_INIT): Change version number from 0.5a to 1.11e.
* m4/amversion.m4: Likewise (autoupdated by './bootstrap').
* .gitignore: Update w.r.t. automake and aclocal wrappers in 't/wrap'.
* t/version4.sh: Require again version '1.4-p3', to avoid useless diffs
with the 'master' branch.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>

diff --git a/.gitignore b/.gitignore
index 87dc8e76f9c04b69030ac1a4285ccfe4710823b3..78b7affb9aa6404259fd842e64336de38664ec35 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -33,8 +33,8 @@
 /doc/amhello/missing
 /lib/Automake/Config.pm
 /test-suite.log
-/t/wrap/aclocal-0.*
-/t/wrap/automake-0.*
+/t/wrap/aclocal-1.*
+/t/wrap/automake-1.*
 /defs-static
 /t/testsuite-part.am
 /t/*-w.tap

diff --git a/configure.ac b/configure.ac
index a00d6adb95b0f0f9f1e2bc2b941eeef654ab10a8..0a48a7ffd2a18f059099bfd445f65bb2e0977797 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -16,7 +16,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 AC_PREREQ([2.68])
-AC_INIT([GNU Automake-NG], [0.5a], [automake-ng@gnu.org])
+AC_INIT([GNU Automake-NG], [1.11e], [automake-ng@gnu.org])
 
 AC_CONFIG_SRCDIR([automake.in])
 AC_CONFIG_AUX_DIR([lib])

diff --git a/m4/amversion.m4 b/m4/amversion.m4
index d9a07a7d171f7afaa01906a6220b25b25c7265d0..15c6dcb3183d43aa89f973b40d124f3152a567dc 100644 (file)
--- a/m4/amversion.m4
+++ b/m4/amversion.m4
@@ -14,10 +14,10 @@
 # generated from the m4 files accompanying Automake X.Y.
 # (This private macro should not be called outside this file.)
 AC_DEFUN([AM_AUTOMAKE_VERSION],
-[am__api_version='0.5a'
+[am__api_version='1.11e'
 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
 dnl require some minimum version.  Point them to the right macro.
-m4_if([$1], [0.5a], [],
+m4_if([$1], [1.11e], [],
       [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
 ])
 
@@ -33,7 +33,7 @@ m4_define([_AM_AUTOCONF_VERSION], [])
 # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
 # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([0.5a])dnl
+[AM_AUTOMAKE_VERSION([1.11e])dnl
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
 _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])

diff --git a/t/version4.sh b/t/version4.sh
index c5214ffaedc623b8dab2046054317e5c89f0ea89..7fa429e179cee2c6cf3271b325f62bad94fdec8e 100755 (executable)
--- a/t/version4.sh
+++ b/t/version4.sh
@@ -19,7 +19,7 @@
 . ./defs || Exit 1
 
 cat > Makefile.am << 'END'
-AUTOMAKE_OPTIONS = 0.4-p3
+AUTOMAKE_OPTIONS = 1.4-p3
 END
 
 $ACLOCAL