* m4/header.m4 (_AM_CONFIG_HEADER_INSINUATE): Use m4_copy instead

of m4_rename so that AC_CONFIG_HEADER is never undefined and
therefore still traced after the redefinition.
* tests/defs (AUTOHEADER): Define.
* tests/autoheader.test: New file.
* tests/Makefile.am (TESTS): Add autoheader.test.
Reported by Braden McDaniel.

diff --git a/ChangeLog b/ChangeLog
index 2455b59a37335c1bdb946877f497a39d21e8f344..b880b5410e3a7f9a1d6c756a5a06dae3c3abd291 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,11 +1,21 @@
-2002-05-03  Paolo Bonzini  <bonzini@gnu.org>
+2002-06-13  Alexandre Duret-Lutz  <duret_g@epita.fr>
+
+       * m4/header.m4 (_AM_CONFIG_HEADER_INSINUATE): Use m4_copy instead
+       of m4_rename so that AC_CONFIG_HEADER is never undefined and
+       therefore still traced after the redefinition.
+       * tests/defs (AUTOHEADER): Define.
+       * tests/autoheader.test: New file.
+       * tests/Makefile.am (TESTS): Add autoheader.test.
+       Reported by Braden McDaniel.
+
+2002-06-13  Paolo Bonzini  <bonzini@gnu.org>
 
        * automake.in (check_gnu_standards): In --gnu mode, accept
        one of COPTING, COPYING.LESSER, or COPYING.LIB.
        (common_files): Add COPYING.LESSER.
        * automake.texi (Gnits): Document this.
 
-2002-05-03  Paolo Bonzini  <bonzini@gnu.org>
+2002-06-13  Paolo Bonzini  <bonzini@gnu.org>
 
        * automake.in (required_targets): Add the pdf and pdf-am targets.
        (initialize_per_input): Likewise.

diff --git a/m4/header.m4 b/m4/header.m4
index dc602a5487cf7b68ace48ce13fee8a51dc0836cf..c2c0a91cce2b7292b6501766c4df4f9084a20ec5 100644 (file)
--- a/m4/header.m4
+++ b/m4/header.m4
@@ -87,8 +87,10 @@ dnl Since the substitution is only effective after AM_INIT_AUTOMAKE,
 dnl make sure AC_CONFIG_HEADERS is not called before.
 AC_BEFORE([AM_INIT_AUTOMAKE], [AC_CONFIG_HEADERS])dnl
 dnl Save the previous AC_CONFIG_HEADERS definition
-m4_rename([AC_CONFIG_HEADERS], [_AM_AC_CONFIG_HEADERS])dnl
-dnl Setup ours.
+dnl (Beware: this must be m4_copy, not m4_rename, because we will
+dnl lose the --trace bit of AC_CONFIG_HEADERS if we undefine it.)
+m4_copy([AC_CONFIG_HEADERS], [_AM_AC_CONFIG_HEADERS])dnl
+dnl Override AC_CONFIG_HEADERS with ours.
 dnl (Don't use m4_copy because we are tracing AM_CONFIG_HEADER.)
 AC_DEFUN([AC_CONFIG_HEADERS], [AM_CONFIG_HEADER($][@)])dnl
 ])

diff --git a/tests/Makefile.am b/tests/Makefile.am
index f85ed3bf301c90bb818e77ff79d59d248c80140d..49ff1cb6b06927a93a506d5bfef821db154648b5 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -30,6 +30,7 @@ ansi6.test \
 ansi7.test \
 ar.test \
 asm.test \
+autoheader.test \
 auxdir.test \
 auxdir2.test \
 backsl.test \

diff --git a/tests/Makefile.in b/tests/Makefile.in
index 0280de36d68cf9211a36f32cea47604a4ddd6439..b4444c1980dfd0a0fc12b9174398bd2a43ac1aa9 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -116,6 +116,7 @@ ansi6.test \
 ansi7.test \
 ar.test \
 asm.test \
+autoheader.test \
 auxdir.test \
 auxdir2.test \
 backsl.test \

diff --git a/tests/autoheader.test b/tests/autoheader.test
new file mode 100755 (executable)
index 0000000..f85243f
--- /dev/null
+++ b/tests/autoheader.test
@@ -0,0 +1,18 @@
+#!/bin/sh
+
+# Check that autoheaders works, despite our AC_CONFIG_HEADERS hack.
+
+. $srcdir/defs
+
+set -e
+
+cat >>configure.in <<EOF
+AC_CONFIG_HEADERS([thisfile.h])
+EOF
+
+: > Makefile.am
+
+$ACLOCAL
+$AUTOHEADER
+
+test -f thisfile.h.in

diff --git a/tests/defs b/tests/defs
index c02a41c2878d8da33e77706aba88ca84e85306e2..dcfa97c20fb5f4316f21f14de6e3ca7781132c04 100644 (file)
--- a/tests/defs
+++ b/tests/defs
@@ -83,6 +83,7 @@ fi
 
 # User can set which tools from Autoconf to use.
 test -z "$AUTOCONF" && AUTOCONF=autoconf
+test -z "$AUTOHEADER" && AUTOHEADER=autoheader
 
 
 echo "=== Running test $0"