From: Alexandre Duret-Lutz <adl@gnu.org>
Date: Thu, 13 Jun 2002 19:45:17 +0000 (+0000)
Subject: * m4/header.m4 (_AM_CONFIG_HEADER_INSINUATE): Use m4_copy instead
X-Git-Tag: Release-1-6b~61
X-Git-Url: https://sourceware.org/git/?a=commitdiff_plain;h=c5780a4fba9332d4058a714effd6e9826984a40a;p=automake.git

* 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 2455b59a..b880b541 100644
--- 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 dc602a54..c2c0a91c 100644
--- 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 f85ed3bf..49ff1cb6 100644
--- 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 0280de36..b4444c19 100644
--- 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
index 00000000..f85243f4
--- /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 c02a41c2..dcfa97c2 100644
--- 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"