From: Akim Demaille <akim@epita.fr>
Date: Thu, 23 Oct 2003 07:56:52 +0000 (+0000)
Subject: * lib/autoconf/general.m4 (_AC_LINK_IFELSE, _AC_COMPILE_IFELSE):
X-Git-Tag: AUTOCONF-2.57g~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7e99ccfaa0ea66773f7351991260dc4a3027f122;p=thirdparty%2Fautoconf.git

* lib/autoconf/general.m4 (_AC_LINK_IFELSE, _AC_COMPILE_IFELSE):
Don't forget to remove conftest.err.
---

diff --git a/ChangeLog b/ChangeLog
index 504354c1..ca829b50 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-10-23  Akim Demaille  <akim@epita.fr>
+
+	* lib/autoconf/general.m4 (_AC_LINK_IFELSE, _AC_COMPILE_IFELSE):
+	Don't forget to remove conftest.err.
+
 2003-10-23  Akim Demaille  <akim@epita.fr>
 
 	* lib/autoconf/general.m4 (_AC_LIBOBJ): Don't insert twice the
diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4
index 592f292b..3981ccfb 100644
--- a/lib/autoconf/general.m4
+++ b/lib/autoconf/general.m4
@@ -1993,9 +1993,11 @@ AC_DEFUN([_AC_RUN_LOG],
 
 # _AC_RUN_LOG_STDERR(COMMAND, LOG-COMMANDS)
 # -----------------------------------------
-# Eval COMMAND, save its stderr into conftest.err, save the exit status
-# in ac_status, and log it.
+# Run COMMAND, save its stderr into conftest.err, save the exit status
+# in ac_status, and log it.  Don't forget to clean up conftest.err after
+# use.
 # Note that when tracing, most shells will leave the traces in stderr
+# starting with "+": that's what this macro tries to address.
 AC_DEFUN([_AC_RUN_LOG_STDERR],
 [{ ($2) >&AS_MESSAGE_LOG_FD
   ($1) 2>conftest.er1
@@ -2017,9 +2019,8 @@ AC_DEFUN([_AC_EVAL],
 
 # _AC_EVAL_STDERR(COMMAND)
 # ------------------------
-# Eval COMMAND, save its stderr into conftest.err, save the exit status
-# in ac_status, and log it.
-# Note that when tracing, most shells will leave the traces in stderr
+# Same as _AC_RUN_LOG_STDERR, but evals  (instead of the running) the
+# COMMAND.
 AC_DEFUN([_AC_EVAL_STDERR],
 [_AC_RUN_LOG_STDERR([eval $1],
 		    [eval echo "$as_me:$LINENO: \"$1\""])])
@@ -2158,7 +2159,7 @@ AS_IF([_AC_EVAL_STDERR($ac_compile) &&
       [$2],
       [_AC_MSG_LOG_CONFTEST
 m4_ifvaln([$3],[$3])dnl])dnl
-rm -f conftest.$ac_objext m4_ifval([$1], [conftest.$ac_ext])[]dnl
+rm -f conftest.err conftest.$ac_objext m4_ifval([$1], [conftest.$ac_ext])[]dnl
 ])# _AC_COMPILE_IFELSE
 
 
@@ -2199,7 +2200,8 @@ AS_IF([_AC_EVAL_STDERR($ac_link) &&
       [$2],
       [_AC_MSG_LOG_CONFTEST
 m4_ifvaln([$3], [$3])dnl])[]dnl
-rm -f conftest.$ac_objext conftest$ac_exeext m4_ifval([$1], [conftest.$ac_ext])[]dnl
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext m4_ifval([$1], [conftest.$ac_ext])[]dnl
 ])# _AC_LINK_IFELSE