[Automake-commit] [SCM] GNU Automake branch, ng/master, updated. v1.11b-118-ge1e9b1b

[Stefano Lattarini]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Automake".

http://git.sv.gnu.org/gitweb/?p=automake.git;a=commitdiff;h=e1e9b1be8b9cf185e5881c4813d597c2ffb5884b

The branch, ng/master has been updated
       via  e1e9b1be8b9cf185e5881c4813d597c2ffb5884b (commit)
      from  b30e38cb5d07cc6a4d5545e1f42ac717c0992a85 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit e1e9b1be8b9cf185e5881c4813d597c2ffb5884b
Author: Stefano Lattarini <address@hidden>
Date:   Fri Apr 20 15:35:23 2012 +0200

    [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 <address@hidden>

-----------------------------------------------------------------------

Summary of changes:
 .gitignore      |    4 ++--
 configure.ac    |    2 +-
 m4/amversion.m4 |    6 +++---
 t/version4.sh   |    2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.gitignore b/.gitignore
index 87dc8e7..78b7aff 100644
--- 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 a00d6ad..0a48a7f 100644
--- 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], address@hidden)
+AC_INIT([GNU Automake-NG], [1.11e], address@hidden)
 
 AC_CONFIG_SRCDIR([automake.in])
 AC_CONFIG_AUX_DIR([lib])
diff --git a/m4/amversion.m4 b/m4/amversion.m4
index d9a07a7..15c6dcb 100644
--- 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 c5214ff..7fa429e 100755
--- 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


hooks/post-receive
-- 
GNU Automake