From: Akim Demaille <akim@epita.fr>
Date: Thu, 18 Jul 2002 11:13:55 +0000 (+0000)
Subject:     Alexandre Duret-Lutz  <duret_g@epita.fr>
X-Git-Tag: AUTOCONF-2.53b~4
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f026c08a36e888652c4b670e42d793e8b13541f4;p=thirdparty%2Fautoconf.git

Alexandre Duret-Lutz  <duret_g@epita.fr>
* lib/autoconf/status.m4 (_AC_OUTPUT_HEADERS): Install
_AC_AM_CONFIG_HEADER_HOOK for Automake 1.7.
---

diff --git a/ChangeLog b/ChangeLog
index 7bc0af476..d5112b16e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2002-07-18  Akim Demaille  <akim@epita.fr>,
+	    Alexandre Duret-Lutz  <duret_g@epita.fr>
+
+	* lib/autoconf/status.m4 (_AC_OUTPUT_HEADERS): Install
+	_AC_AM_CONFIG_HEADER_HOOK for Automake 1.7.
+
 2002-07-17  Russ Allbery  <rra@stanford.edu>
 
 	* doc/autoconf.texi (Initializing configure): Clarify the
diff --git a/lib/autoconf/status.m4 b/lib/autoconf/status.m4
index 18bbf3756..8c5dd61d9 100644
--- a/lib/autoconf/status.m4
+++ b/lib/autoconf/status.m4
@@ -326,8 +326,11 @@ AC_DEFUN([AC_CONFIG_COMMANDS_PRE],
 [m4_append([AC_OUTPUT_COMMANDS_PRE], [$1
 ])])
 
-# Initialize.
-m4_define([AC_OUTPUT_COMMANDS_PRE])
+
+# AC_OUTPUT_COMMANDS_PRE
+# ----------------------
+m4_define([AC_OUTPUT_COMMANDS_PRE],
+[])
 
 
 # AC_CONFIG_COMMANDS_POST(CMDS)
@@ -654,6 +657,11 @@ cat >>$CONFIG_STATUS <<\_ACEOF
     cat $tmp/config.h
     rm -f $tmp/config.h
   fi
+dnl If running for Automake, be ready to perform additional
+dnl commands to set up the timestamp files.
+m4_ifdef([_AC_AM_CONFIG_HEADER_HOOK],
+         [_AC_AM_CONFIG_HEADER_HOOK([$ac_file])
+])dnl
 m4_ifset([AC_LIST_HEADERS_COMMANDS],
 [  # Run the commands associated with the file.
   case $ac_file in