From: Paul Eggert <eggert@cs.ucla.edu>
Date: Mon, 17 Apr 2006 06:10:50 +0000 (+0000)
Subject: * lib/autoconf/general.m4 (_AC_INIT_CONFIG_LOG): Don't
X-Git-Tag: AUTOCONF-2.59d~123
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5863d13f3fd11aa90aaec2f1aa1fa1a8a9db6ef9;p=thirdparty%2Fautoconf.git

* lib/autoconf/general.m4 (_AC_INIT_CONFIG_LOG): Don't
use ">&-" since we're only 99.999% sure that this is portable,
and since the MinGW bug is fixed in a different way.
* lib/autotest/general.m4 (AT_INIT): Likewise.

* lib/autoconf/status.m4 (_AC_OUTPUT_CONFIG_STATUS): Handle --recheck
before opening config.log, to avoid hitting a bug on MinGW.
---

diff --git a/ChangeLog b/ChangeLog
index 17087c86b..7fa6fe73b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2006-04-16  Paul Eggert  <eggert@cs.ucla.edu>
+
+	* lib/autoconf/general.m4 (_AC_INIT_CONFIG_LOG): Don't
+	use ">&-" since we're only 99.999% sure that this is portable,
+	and since the MinGW bug is fixed in a different way.
+	* lib/autotest/general.m4 (AT_INIT): Likewise.
+
+2006-04-16  Stepan Kasal  <kasal@ucw.cz>
+
+	* lib/autoconf/status.m4 (_AC_OUTPUT_CONFIG_STATUS): Handle --recheck
+	before opening config.log, to avoid hitting a bug on MinGW.
+
 2006-04-14  Paul Eggert  <eggert@cs.ucla.edu>
 
 	* lib/autoconf/general.m4 (_AC_INIT_CONFIG_LOG): Close
diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4
index 265f2c60b..890af0baa 100644
--- a/lib/autoconf/general.m4
+++ b/lib/autoconf/general.m4
@@ -1103,7 +1103,6 @@ fi])dnl
 m4_define([_AC_INIT_CONFIG_LOG],
 [m4_divert_text([INIT_PREPARE],
 [m4_define([AS_MESSAGE_LOG_FD], 5)dnl
-exec AS_MESSAGE_LOG_FD>&- # Work around a MinGW bug.
 cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
diff --git a/lib/autoconf/status.m4 b/lib/autoconf/status.m4
index 8a66304af..a0239a518 100644
--- a/lib/autoconf/status.m4
+++ b/lib/autoconf/status.m4
@@ -1270,6 +1270,19 @@ if $ac_cs_silent; then
   ac_configure_extra_args="$ac_configure_extra_args --silent"
 fi
 
+_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF
+dnl Check this before opening the log, to avoid a bug on MinGW,
+dnl which prohibits the recursive instance from truncating an open log.
+if \$ac_cs_recheck; then
+  echo "running CONFIG_SHELL=$SHELL $SHELL $[0] " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&AS_MESSAGE_FD
+  CONFIG_SHELL=$SHELL
+  export CONFIG_SHELL
+  exec $SHELL "$[0]" $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+fi
+
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF
 dnl Open the log:
 m4_rename([_AC_save_AS_MESSAGE_LOG_FD], [AS_MESSAGE_LOG_FD])dnl
 exec AS_MESSAGE_LOG_FD>>config.log
@@ -1281,12 +1294,6 @@ exec AS_MESSAGE_LOG_FD>>config.log
 
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
-if \$ac_cs_recheck; then
-  echo "running CONFIG_SHELL=$SHELL $SHELL $[0] " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&AS_MESSAGE_FD
-  CONFIG_SHELL=$SHELL
-  export CONFIG_SHELL
-  exec $SHELL "$[0]" $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
-fi
 m4_ifdef([_AC_OUTPUT_COMMANDS_INIT],
 [#
 # INIT-COMMANDS
diff --git a/lib/autotest/general.m4 b/lib/autotest/general.m4
index d5b4b361f..dbf6c4ea6 100644
--- a/lib/autotest/general.m4
+++ b/lib/autotest/general.m4
@@ -601,7 +601,6 @@ m4_define([AS_MESSAGE_LOG_FD], [5])
 if $at_debug_p; then
   at_suite_log=/dev/null
 else
-  exec AS_MESSAGE_LOG_FD>&- # Work around a MinGW bug.
   : >"$at_suite_log"
 fi
 exec AS_MESSAGE_LOG_FD>>"$at_suite_log"