summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--Makefile.in2
-rw-r--r--aclocal.m42
-rwxr-xr-xconfigure22
-rw-r--r--configure.ac2
-rw-r--r--doc/Makefile.in2
-rw-r--r--doc/automake.texi2
-rw-r--r--lib/Automake/Makefile.in2
-rw-r--r--lib/Automake/tests/Makefile.in2
-rw-r--r--lib/Makefile.in2
-rw-r--r--lib/am/Makefile.in2
-rw-r--r--m4/Makefile.in2
-rw-r--r--m4/amversion.m46
-rw-r--r--tests/Makefile.in2
14 files changed, 30 insertions, 25 deletions
diff --git a/ChangeLog b/ChangeLog
index 138091f61..a159858f2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2009-05-17 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
+ Automake 1.11.
+ * configure.ac: Bump version to 1.11.
+ * doc/automake.texi (Releases): Add line for 1.11. Remove line
+ for 1.10b.
+
Fix maintainer-check failures.
* automake.in (lang_vala_finish_target): Use `$(am__cd)' instead
of plain `cd'.
diff --git a/Makefile.in b/Makefile.in
index bb53c6357..fc8056b9b 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10c from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
diff --git a/aclocal.m4 b/aclocal.m4
index d085be54f..4aceebf96 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.10c -*- Autoconf -*-
+# generated automatically by aclocal 1.11 -*- Autoconf -*-
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
diff --git a/configure b/configure
index 6fb2ae72a..66710d084 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.63 for GNU Automake 1.10c.
+# Generated by GNU Autoconf 2.63 for GNU Automake 1.11.
#
# Report bugs to <bug-automake@gnu.org>.
#
@@ -596,8 +596,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
PACKAGE_NAME='GNU Automake'
PACKAGE_TARNAME='automake'
-PACKAGE_VERSION='1.10c'
-PACKAGE_STRING='GNU Automake 1.10c'
+PACKAGE_VERSION='1.11'
+PACKAGE_STRING='GNU Automake 1.11'
PACKAGE_BUGREPORT='bug-automake@gnu.org'
ac_unique_file="automake.in"
@@ -1240,7 +1240,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures GNU Automake 1.10c to adapt to many kinds of systems.
+\`configure' configures GNU Automake 1.11 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1309,7 +1309,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of GNU Automake 1.10c:";;
+ short | recursive ) echo "Configuration of GNU Automake 1.11:";;
esac
cat <<\_ACEOF
@@ -1376,7 +1376,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-GNU Automake configure 1.10c
+GNU Automake configure 1.11
generated by GNU Autoconf 2.63
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1390,7 +1390,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by GNU Automake $as_me 1.10c, which was
+It was created by GNU Automake $as_me 1.11, which was
generated by GNU Autoconf 2.63. Invocation command line was
$ $0 $@
@@ -1847,7 +1847,7 @@ am_AUTOCONF="${AUTOCONF-autoconf}"
am_AUTOHEADER="${AUTOHEADER-autoheader}"
-am__api_version='1.10c'
+am__api_version='1.11'
# Find a good install program. We prefer a C program (faster),
# so one script is as good as another. But avoid the broken or
@@ -2297,7 +2297,7 @@ fi
# Define the identity of the package.
PACKAGE='automake'
- VERSION='1.10c'
+ VERSION='1.11'
cat >>confdefs.h <<_ACEOF
@@ -3308,7 +3308,7 @@ exec 6>&1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by GNU Automake $as_me 1.10c, which was
+This file was extended by GNU Automake $as_me 1.11, which was
generated by GNU Autoconf 2.63. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3358,7 +3358,7 @@ Report bugs to <bug-autoconf@gnu.org>."
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_version="\\
-GNU Automake config.status 1.10c
+GNU Automake config.status 1.11
configured by $0, generated by GNU Autoconf 2.63,
with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff --git a/configure.ac b/configure.ac
index 56da8e25f..759952dde 100644
--- a/configure.ac
+++ b/configure.ac
@@ -16,7 +16,7 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-AC_INIT([GNU Automake], [1.10c], [bug-automake@gnu.org])
+AC_INIT([GNU Automake], [1.11], [bug-automake@gnu.org])
AC_CONFIG_SRCDIR(automake.in)
AC_CONFIG_AUX_DIR(lib)
diff --git a/doc/Makefile.in b/doc/Makefile.in
index 11511189e..dd569fefb 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10c from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
diff --git a/doc/automake.texi b/doc/automake.texi
index dc89abf44..1c9302483 100644
--- a/doc/automake.texi
+++ b/doc/automake.texi
@@ -12774,7 +12774,7 @@ parentheses is the number of generated test cases.
@item 2006-10-15 @tab 1.10 @tab 7859 @tab 1072 @tab 8024 @tab 3512 (40) @tab 1496 (34) @tab 172 @tab 604
@item 2008-01-19 @tab 1.10.1 @tab 7870 @tab 1089 @tab 8025 @tab 3520 (40) @tab 1499 (34) @tab 173 @tab 617
@item 2008-11-23 @tab 1.10.2 @tab 7882 @tab 1089 @tab 8027 @tab 3540 (40) @tab 1509 (34) @tab 176 @tab 628
-@item 2009-03-29 @tab 1.10b @tab 8556 @tab 1092 @tab 8281 @tab 4106 (41) @tab 1608 (35) @tab 178 @tab 720 (20)
+@item 2009-05-17 @tab 1.11 @tab 8721 @tab 1092 @tab 8289 @tab 4164 (42) @tab 1714 (37) @tab 181 @tab 732 (20)
@end multitable
diff --git a/lib/Automake/Makefile.in b/lib/Automake/Makefile.in
index 25c2843e9..3390893c8 100644
--- a/lib/Automake/Makefile.in
+++ b/lib/Automake/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10c from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
diff --git a/lib/Automake/tests/Makefile.in b/lib/Automake/tests/Makefile.in
index 9f3a097c3..7c337775b 100644
--- a/lib/Automake/tests/Makefile.in
+++ b/lib/Automake/tests/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10c from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
diff --git a/lib/Makefile.in b/lib/Makefile.in
index 3773bd180..5ad9b3809 100644
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10c from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
diff --git a/lib/am/Makefile.in b/lib/am/Makefile.in
index 84d09f0de..065404b79 100644
--- a/lib/am/Makefile.in
+++ b/lib/am/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10c from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
diff --git a/m4/Makefile.in b/m4/Makefile.in
index bb7bbf987..0034578d1 100644
--- a/m4/Makefile.in
+++ b/m4/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10c from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
diff --git a/m4/amversion.m4 b/m4/amversion.m4
index c6a24afb0..aae0c28a0 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.10c'
+[am__api_version='1.11'
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.10c], [],
+m4_if([$1], [1.11], [],
[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.10c])dnl
+[AM_AUTOMAKE_VERSION([1.11])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/tests/Makefile.in b/tests/Makefile.in
index abce1cd95..e084c6c6b 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10c from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,