Re: [bug-gettext] Gettext doesn't bootstrap with development version of Automake

[Daiki Ueno]

Stefano Lattarini <address@hidden> writes:

> This is due to the fact that AM_CONFIG_HEADER (that had been superseded by
> autoconf-provided AC_CONFIG_HEADERS macro since 2002) has been deprecated
> in Automake 1.12, and will be removed in Automake 1.13

Thanks.  Pushed the following change.

---
 gettext-runtime/ChangeLog                |    5 +++++
 gettext-runtime/configure.ac             |    2 +-
 gettext-runtime/libasprintf/ChangeLog    |    5 +++++
 gettext-runtime/libasprintf/configure.ac |    2 +-
 gettext-tools/ChangeLog                  |    5 +++++
 gettext-tools/configure.ac               |    2 +-
 6 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/gettext-runtime/ChangeLog b/gettext-runtime/ChangeLog
index c3e6e95..1b7b8f7 100644
--- a/gettext-runtime/ChangeLog
+++ b/gettext-runtime/ChangeLog
@@ -1,3 +1,8 @@
+2012-12-17  Daiki Ueno  <address@hidden>
+
+       * configure.ac: Use AC_CONFIG_HEADERS instead of AM_CONFIG_HEADER.
+       Suggested by Stefano Lattarini <address@hidden>.
+
 2012-01-26  Bruno Haible  <address@hidden>
 
        Modernize quoting.
diff --git a/gettext-runtime/configure.ac b/gettext-runtime/configure.ac
index 99c80ba..745caf6 100644
--- a/gettext-runtime/configure.ac
+++ b/gettext-runtime/configure.ac
@@ -23,7 +23,7 @@ AC_CONFIG_AUX_DIR([../build-aux])
 . $srcdir/../version.sh
 gl_INIT_PACKAGE([gettext-runtime], [$VERSION_NUMBER])
 AM_INIT_AUTOMAKE([silent-rules])
-AM_CONFIG_HEADER([config.h])
+AC_CONFIG_HEADERS([config.h])
 
 dnl Installation directories.
 test "$docdir" != '${datarootdir}/doc/${PACKAGE}' || 
docdir='${datarootdir}/doc/gettext'
diff --git a/gettext-runtime/libasprintf/ChangeLog 
b/gettext-runtime/libasprintf/ChangeLog
index 6addb37..36b3837 100644
--- a/gettext-runtime/libasprintf/ChangeLog
+++ b/gettext-runtime/libasprintf/ChangeLog
@@ -1,3 +1,8 @@
+2012-12-17  Daiki Ueno  <address@hidden>
+
+       * configure.ac: Use AC_CONFIG_HEADERS instead of AM_CONFIG_HEADER.
+       Suggested by Stefano Lattarini <address@hidden>.
+
 2012-11-29  Paul Eggert  <address@hidden>
 
        * vasnprintf.c (MAX_ROOM_NEEDED): Now static, not static
diff --git a/gettext-runtime/libasprintf/configure.ac 
b/gettext-runtime/libasprintf/configure.ac
index f021f3d..19a9556 100644
--- a/gettext-runtime/libasprintf/configure.ac
+++ b/gettext-runtime/libasprintf/configure.ac
@@ -21,7 +21,7 @@ AC_INIT([libasprintf], [1.0])
 AC_CONFIG_SRCDIR([vasprintf.c])
 AC_CONFIG_AUX_DIR([../../build-aux])
 AM_INIT_AUTOMAKE([silent-rules])
-AM_CONFIG_HEADER([config.h])
+AC_CONFIG_HEADERS([config.h])
 
 dnl Checks for programs.
 AC_PROG_CC
diff --git a/gettext-tools/ChangeLog b/gettext-tools/ChangeLog
index b405056..a259b3f 100644
--- a/gettext-tools/ChangeLog
+++ b/gettext-tools/ChangeLog
@@ -1,3 +1,8 @@
+2012-12-17  Daiki Ueno  <address@hidden>
+
+       * configure.ac: Use AC_CONFIG_HEADERS instead of AM_CONFIG_HEADER.
+       Suggested by Stefano Lattarini <address@hidden>.
+
 2012-01-26  Bruno Haible  <address@hidden>
 
        Modernize quoting.
diff --git a/gettext-tools/configure.ac b/gettext-tools/configure.ac
index 8db84d3..4064f9a 100644
--- a/gettext-tools/configure.ac
+++ b/gettext-tools/configure.ac
@@ -23,7 +23,7 @@ AC_CONFIG_AUX_DIR([../build-aux])
 . $srcdir/../version.sh
 gl_INIT_PACKAGE([gettext-tools], [$VERSION_NUMBER])
 AM_INIT_AUTOMAKE([silent-rules])
-AM_CONFIG_HEADER([config.h])
+AC_CONFIG_HEADERS([config.h])
 
 dnl Installation directories.
 test "$docdir" != '${datarootdir}/doc/${PACKAGE}' || 
docdir='${datarootdir}/doc/gettext'
-- 
1.7.10.4