From: Stefano Lattarini Date: Wed, 25 Apr 2012 21:14:52 +0000 (+0200) Subject: post-release: minor version bump X-Git-Tag: v1.12.0b~56 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d3eaa6aa4e6f83d0fc5cf69f765ab72ddcf0ff94;p=thirdparty%2Fautomake.git post-release: minor version bump This is for the maint branch. * configure.ac, m4/amversion.m4: Bump version to 1.12.0a. Signed-off-by: Stefano Lattarini --- diff --git a/configure.ac b/configure.ac index ec00d2621..2c78288d4 100644 --- a/configure.ac +++ b/configure.ac @@ -16,7 +16,7 @@ # along with this program. If not, see . AC_PREREQ([2.68]) -AC_INIT([GNU Automake], [1.12], [bug-automake@gnu.org]) +AC_INIT([GNU Automake], [1.12.0a], [bug-automake@gnu.org]) AC_CONFIG_SRCDIR([automake.in]) AC_CONFIG_AUX_DIR([lib]) diff --git a/m4/amversion.m4 b/m4/amversion.m4 index b70bec215..f6ed132de 100644 --- a/m4/amversion.m4 +++ b/m4/amversion.m4 @@ -17,7 +17,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version='1.12' 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.12.0a], [], [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.12.0a])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])