From: Stefano Lattarini Date: Sat, 4 May 2013 22:53:27 +0000 (+0200) Subject: maint branch: we are going to become Automake 1.14 X-Git-Tag: v1.13b~67 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1667d369091fe41d2bbdf645490a29d45142556f;p=thirdparty%2Fautomake.git maint branch: we are going to become Automake 1.14 * configure.ac (AC_INIT): So adjust beta version in here, from 1.13.2a to 1.13a. * m4/amversion.m4: Regenerate. Signed-off-by: Stefano Lattarini --- diff --git a/configure.ac b/configure.ac index 840abf472..043b46795 100644 --- a/configure.ac +++ b/configure.ac @@ -16,7 +16,7 @@ # along with this program. If not, see . AC_PREREQ([2.69]) -AC_INIT([GNU Automake], [1.13.2a], [bug-automake@gnu.org]) +AC_INIT([GNU Automake], [1.13a], [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 02b309c8f..e8e5e360f 100644 --- a/m4/amversion.m4 +++ b/m4/amversion.m4 @@ -12,10 +12,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.13' +[am__api_version='1.13a' 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.13.2a], [], +m4_if([$1], [1.13a], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -31,7 +31,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.13.2a])dnl +[AM_AUTOMAKE_VERSION([1.13a])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])