* lib/autoconf/status.m4 (_AC_OUTPUT_CONFIG_STATUS): Fix the
previous patch.
* tests/atspecific.m4 (AT_CHECK_AUTOHEADER): Can create `config.hin~'.
diff --git a/ChangeLog b/ChangeLog
index a8f43e2..f2b8f89 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2001-08-31  Akim Demaille  <akim@epita.fr>
 
+	* lib/autoconf/status.m4 (_AC_OUTPUT_CONFIG_STATUS): Fix the
+	previous patch.
+	* tests/atspecific.m4 (AT_CHECK_AUTOHEADER): Can create `config.hin~'.
+
+2001-08-31  Akim Demaille  <akim@epita.fr>
+
 	* lib/autoconf/status.m4 (_AC_OUTPUT_CONFIG_STATUS): DU 5.0 has
 	serious problems handling heredocs in heredocs.
 	Reported by Nicolas Joly.
diff --git a/lib/autoconf/status.m4 b/lib/autoconf/status.m4
index 1894ddb..c16aecb 100644
--- a/lib/autoconf/status.m4
+++ b/lib/autoconf/status.m4
@@ -1227,8 +1227,10 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.  Logging --version etc. is OK.
 exec AS_MESSAGE_LOG_FD>>config.log
-echo >&AS_MESSAGE_LOG_FD
-AS_BOX([Running \$as_me.]) >&AS_MESSAGE_LOG_FD
+{
+  echo
+  AS_BOX([Running \$as_me.])
+} >&AS_MESSAGE_LOG_FD
 cat >&AS_MESSAGE_LOG_FD <<_CSEOF
 
 This file was extended by m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])dnl
diff --git a/tests/atspecific.m4 b/tests/atspecific.m4
index 43f4e19..d0b2984 100644
--- a/tests/atspecific.m4
+++ b/tests/atspecific.m4
@@ -73,7 +73,7 @@
 #                     STDOUT, [STDERR = `autoheader: `config.hin' is created'])
 # -----------------------------------------------------------------------------
 m4_define([AT_CHECK_AUTOHEADER],
-[AT_CLEANUP_FILES(config.hin)dnl
+[AT_CLEANUP_FILES(config.hin config.hin~)dnl
 AT_CHECK([autoheader --localdir=$srcdir $1], [$2],
          [$3],
          m4_default([$4], [[autoheader: `config.hin' is created