Switch to autoconf 2.69 and automake 1.12.
diff --git a/ChangeLog b/ChangeLog
index 42aeda3..a782e57 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2012-04-28 Bruno Haible <bruno@clisp.org>
+
+ Switch to autoconf 2.69 and automake 1.12.
+ * autogen.sh: Update comment.
+ * Makefile.devel (AUTOCONF, AUTOHEADER): Switch to version 2.69.
+ (AUTOMAKE, ACLOCAL): Switch to version 1.12.
+ * preload/Makefile.devel (AUTOCONF): Switch to version 2.69.
+ (ACLOCAL): Switch to version 1.12.
+
2012-03-24 Bruno Haible <bruno@clisp.org>
Avoid a GCC warning.
diff --git a/Makefile.devel b/Makefile.devel
index 51698c4..c781577 100644
--- a/Makefile.devel
+++ b/Makefile.devel
@@ -4,10 +4,10 @@
SHELL = /bin/sh
MAKE = make
-AUTOCONF = autoconf-2.68
-AUTOHEADER = autoheader-2.68
-AUTOMAKE = automake-1.11
-ACLOCAL = aclocal-1.11
+AUTOCONF = autoconf-2.69
+AUTOHEADER = autoheader-2.69
+AUTOMAKE = automake-1.12
+ACLOCAL = aclocal-1.12
GPERF = gperf
CC = gcc
CFLAGS = -O
diff --git a/autogen.sh b/autogen.sh
index c9ff5e0..dd7cb5b 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.63..2.68 and automake-1.11 in the PATH.
+# This script requires autoconf-2.63..2.69 and automake-1.11..1.12 in the PATH.
# It also requires either
# - the GNULIB_TOOL environment variable pointing to the gnulib-tool script
# in a gnulib checkout, or
@@ -12,7 +12,7 @@
# It also requires
# - the gperf program.
-# Copyright (C) 2003-2010 Free Software Foundation, Inc.
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/libcharset/ChangeLog b/libcharset/ChangeLog
index d85ef53..cfca5d2 100644
--- a/libcharset/ChangeLog
+++ b/libcharset/ChangeLog
@@ -1,3 +1,9 @@
+2012-04-28 Bruno Haible <bruno@clisp.org>
+
+ Switch to autoconf 2.69 and automake 1.12.
+ * Makefile.devel (AUTOCONF, AUTOHEADER): Switch to version 2.69.
+ (ACLOCAL): Switch to version 1.12.
+
2011-10-18 Bruno Haible <bruno@clisp.org>
* m4/libtool.m4: Update from libtool-2.4.2, with modifications:
diff --git a/libcharset/Makefile.devel b/libcharset/Makefile.devel
index 174cd15..a41611c 100644
--- a/libcharset/Makefile.devel
+++ b/libcharset/Makefile.devel
@@ -3,9 +3,9 @@
SHELL = /bin/sh
MAKE = make
-AUTOCONF = autoconf-2.68
-AUTOHEADER = autoheader-2.68
-ACLOCAL = aclocal-1.11
+AUTOCONF = autoconf-2.69
+AUTOHEADER = autoheader-2.69
+ACLOCAL = aclocal-1.12
CP = cp
RM = rm -f
diff --git a/preload/Makefile.devel b/preload/Makefile.devel
index 544059a..5757138 100644
--- a/preload/Makefile.devel
+++ b/preload/Makefile.devel
@@ -3,8 +3,8 @@
SHELL = /bin/sh
MAKE = make
-AUTOCONF = autoconf-2.68
-ACLOCAL = aclocal-1.11
+AUTOCONF = autoconf-2.69
+ACLOCAL = aclocal-1.12
CP = cp
RM = rm -f
