Switch to automake-1.11.
diff --git a/ChangeLog b/ChangeLog
index 1dbfd51..3bf66a3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-05-19 Bruno Haible <bruno@clisp.org>
+
+ * Makefile.devel (AUTOMAKE, ACLOCAL): Switch to version 1.11.
+ * autogen.sh: Update comments.
+
2009-04-24 Bruno Haible <bruno@clisp.org>
Fix a compilation error on HP-UX 11.00, introduced on 2008-09-16.
diff --git a/Makefile.devel b/Makefile.devel
index e4bde42..584d703 100644
--- a/Makefile.devel
+++ b/Makefile.devel
@@ -6,8 +6,8 @@
MAKE = make
AUTOCONF = autoconf-2.63
AUTOHEADER = autoheader-2.63
-AUTOMAKE = automake-1.10
-ACLOCAL = aclocal-1.10
+AUTOMAKE = automake-1.11
+ACLOCAL = aclocal-1.11
GPERF = gperf
CC = gcc
CFLAGS = -O
diff --git a/autogen.sh b/autogen.sh
index 13e48b2..0be903c 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -4,7 +4,7 @@
# also regenerates all aclocal.m4, config.h.in, Makefile.in, configure files
# with new versions of autoconf or automake.
#
-# This script requires autoconf-2.62 and automake-1.10 in the PATH.
+# This script requires autoconf-2.63 and automake-1.11 in the PATH.
# It also requires either
# - the GNULIB_TOOL environment variable pointing to the gnulib-tool script
# in a gnulib checkout, or
diff --git a/libcharset/ChangeLog b/libcharset/ChangeLog
index 2f3fd7b..5dffa46 100644
--- a/libcharset/ChangeLog
+++ b/libcharset/ChangeLog
@@ -1,3 +1,8 @@
+2009-05-19 Bruno Haible <bruno@clisp.org>
+
+ * Makefile.devel (AUTOMAKE, ACLOCAL): Switch to version 1.11.
+ * autogen.sh: Update comments.
+
2009-01-25 Bruno Haible <bruno@clisp.org>
Don't install charset.alias on MacOS X >= 10.3.
diff --git a/libcharset/Makefile.devel b/libcharset/Makefile.devel
index bd1475b..ca35f64 100644
--- a/libcharset/Makefile.devel
+++ b/libcharset/Makefile.devel
@@ -5,7 +5,7 @@
MAKE = make
AUTOCONF = autoconf-2.63
AUTOHEADER = autoheader-2.63
-ACLOCAL = aclocal-1.10
+ACLOCAL = aclocal-1.11
CP = cp
RM = rm -f
diff --git a/libcharset/autogen.sh b/libcharset/autogen.sh
index 6f06004..37ed7ab 100755
--- a/libcharset/autogen.sh
+++ b/libcharset/autogen.sh
@@ -2,7 +2,7 @@
# Convenience script for regenerating all aclocal.m4, config.h.in, Makefile.in,
# configure files with new versions of autoconf or automake.
#
-# This script requires autoconf-2.61 and automake-1.10 in the PATH.
+# This script requires autoconf-2.63 and automake-1.11 in the PATH.
# Copyright (C) 2003-2007, 2009 Free Software Foundation, Inc.
#
