[Automake-commit] [SCM] GNU Automake branch, master, updated. v1.12-4-g5368def

[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=5368def8bb1635d7275a2ac3e08b8127933afe05

The branch, master has been updated
       via  5368def8bb1635d7275a2ac3e08b8127933afe05 (commit)
       via  ec799b7b8baf649b8031d9b5cbdecf78a057c3a3 (commit)
       via  d3eaa6aa4e6f83d0fc5cf69f765ab72ddcf0ff94 (commit)
       via  119d65e9e06ffc6e8997d3ba386429db6cc2ef27 (commit)
      from  a18d188cc8e8c0a3f84494a2f1f2df26630f038e (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 5368def8bb1635d7275a2ac3e08b8127933afe05
Author: Stefano Lattarini <address@hidden>
Date:   Wed Apr 25 23:24:07 2012 +0200

    post-release: major version bump
    
    This is for the master branch.
    
    * configure.ac, m4/amversion.m4: Bump version to 1.12a.
    
    Signed-off-by: Stefano Lattarini <address@hidden>

commit ec799b7b8baf649b8031d9b5cbdecf78a057c3a3
Merge: 119d65e d3eaa6a
Author: Stefano Lattarini <address@hidden>
Date:   Wed Apr 25 23:15:39 2012 +0200

    Merge branch 'maint'
    
    * maint:
      post-release: minor version bump

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

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

diff --git a/configure.ac b/configure.ac
index ec00d26..1885836 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], [1.12], address@hidden)
+AC_INIT([GNU Automake], [1.12a], address@hidden)
 
 AC_CONFIG_SRCDIR([automake.in])
 AC_CONFIG_AUX_DIR([lib])
diff --git a/m4/amversion.m4 b/m4/amversion.m4
index b70bec2..74e7972 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='1.12'
+[am__api_version='1.12a'
 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], [1.12], [],
+m4_if([$1], [1.12a], [],
       [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([1.12])dnl
+[AM_AUTOMAKE_VERSION([1.12a])dnl
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
 _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])


hooks/post-receive
-- 
GNU Automake