From 14b9ec0ed59264f1c16b5cbff564cc4b2aaa868f Mon Sep 17 00:00:00 2001 From: Peter Rosin Date: Mon, 3 Jun 2013 16:19:52 +0200 Subject: typofix: fix grammaro in comments in t/tags-pr12372.sh Signed-off-by: Stefano Lattarini --- t/tags-pr12372.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/t/tags-pr12372.sh b/t/tags-pr12372.sh index 657be6088..6cf6e6e30 100644 --- a/t/tags-pr12372.sh +++ b/t/tags-pr12372.sh @@ -63,7 +63,7 @@ $AUTOMAKE ./configure -# Exuberant Ctags (at least version 5.8) do not generate any tags +# Exuberant Ctags (at least version 5.8) doesn't generate any tags # for file extensions it doesn't recognize. This can be fixed by # using the '--langmap' option. But we must be careful, because # etags from Emacs (at least version 23.4) doesn't recognize that -- cgit v1.2.1 From e166a135ee816d82829e59f669ca4d61a767adc0 Mon Sep 17 00:00:00 2001 From: Stefano Lattarini Date: Mon, 3 Jun 2013 18:03:24 +0200 Subject: release: stable micro release 1.13.3 * configure.ac (AC_INIT): Bump version number to 1.13.3. * m4/amversion.m4: Likewise (auto-updated by "make bootstrap"). Signed-off-by: Stefano Lattarini --- configure.ac | 2 +- m4/amversion.m4 | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 5966c6dac..ae5a98262 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.2c], [bug-automake@gnu.org]) +AC_INIT([GNU Automake], [1.13.3], [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 0a82c1130..51c207247 100644 --- a/m4/amversion.m4 +++ b/m4/amversion.m4 @@ -15,7 +15,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version='1.13' 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.2c], [], +m4_if([$1], [1.13.3], [], [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.2c])dnl +[AM_AUTOMAKE_VERSION([1.13.3])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) -- cgit v1.2.1 From 0ebaea2db692519209d739b54d051e11346ebb80 Mon Sep 17 00:00:00 2001 From: Stefano Lattarini Date: Mon, 3 Jun 2013 21:13:34 +0200 Subject: post-release: micro version bump (1.13.3a) * configure.ac: Bump version: 1.13.3 -> 1.13.3a * m4/amversion.m4: Likewise (auto-updated by "make bootstrap"). Signed-off-by: Stefano Lattarini --- configure.ac | 2 +- m4/amversion.m4 | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index ae5a98262..0a353b436 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.3], [bug-automake@gnu.org]) +AC_INIT([GNU Automake], [1.13.3a], [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 51c207247..1a044e096 100644 --- a/m4/amversion.m4 +++ b/m4/amversion.m4 @@ -15,7 +15,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version='1.13' 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.3], [], +m4_if([$1], [1.13.3a], [], [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.3])dnl +[AM_AUTOMAKE_VERSION([1.13.3a])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) -- cgit v1.2.1 From de1343a64dd80d931ba6c4f26e35c7db4919dc1f Mon Sep 17 00:00:00 2001 From: Stefano Lattarini Date: Mon, 3 Jun 2013 21:15:50 +0200 Subject: configure: remove an obsolete TODO comment * configure.ac: Here. Signed-off-by: Stefano Lattarini --- configure.ac | 3 --- 1 file changed, 3 deletions(-) diff --git a/configure.ac b/configure.ac index 0a353b436..6cc59737e 100644 --- a/configure.ac +++ b/configure.ac @@ -277,9 +277,6 @@ exit 77" >&AS_MESSAGE_LOG_FD 2>&1; test $? -eq 77; } # would emit "P=1" into file with /usr/xpg4/bin/sh from Solaris 10 and # /bin/sh from SunOS 5.11 and OpenBSD 4.7. # -# Finally, we look for weird bugs and portability problems mentioned in -# the Autoconf manual, and reject shells that suffers from them. (TODO) -# # Use '$am_score' to indicate the degree of acceptability of the shell. # A score of "10" means that the shell is good enough for our needs; # a score of "9" means that the shell has some minor bugs or limitation, -- cgit v1.2.1