From: Akim Demaille <akim@epita.fr>
Date: Fri, 4 Aug 2000 09:04:56 +0000 (+0000)
Subject: * acgeneral.m4: (AC_RUN_IFELSE, AC_LINK_IFELSE, AC_COMPILE_IFELSE):
X-Git-Tag: autoconf-2.50~669
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ae2c1ff1f7a9490dd0b42be60849677b3659adea;p=thirdparty%2Fautoconf.git

* acgeneral.m4: (AC_RUN_IFELSE, AC_LINK_IFELSE, AC_COMPILE_IFELSE):
Don't create the source file if none is given, and in this case,
don't remove it either.
---

diff --git a/ChangeLog b/ChangeLog
index 20713e16a..34037a9ea 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2000-08-04  Akim Demaille  <akim@epita.fr>
+
+	* acgeneral.m4: (AC_RUN_IFELSE, AC_LINK_IFELSE, AC_COMPILE_IFELSE):
+	Don't create the source file if none is given, and in this case,
+	don't remove it either.
+
 2000-08-04  Akim Demaille  <akim@epita.fr>
 
 	* libm4.m4 (m4_ifvanl): New macro.
diff --git a/acgeneral.m4 b/acgeneral.m4
index c8a4002f1..80d1c466f 100644
--- a/acgeneral.m4
+++ b/acgeneral.m4
@@ -3283,17 +3283,15 @@ rm -f conftest*
 # --------------------------------------------------------------------
 # Try to compile PROGRAM.
 AC_DEFUN([AC_COMPILE_IFELSE],
-[AC_LANG_CONFTEST([$1])
+[m4_ifvanl([$1], [AC_LANG_CONFTEST([$1])])dnl
 if AC_TRY_EVAL(ac_compile) && test -s conftest.$ac_objext; then
   m4_default([$2], :)
 else
   echo "configure: failed program was:" >&AC_FD_LOG
   cat conftest.$ac_ext >&AC_FD_LOG
-ifval([$3],
-[  $3
-])dnl
+m4_ifvanl([$3],[  $3])dnl
 fi
-rm -f conftest*[]dnl
+rm -f conftest.$ac_objext ifval([$1], [conftest.$ac_ext])[]dnl
 ])# AC_COMPILE_IFELSE
 
 
@@ -3314,17 +3312,16 @@ AC_DEFUN([AC_TRY_COMPILE],
 # -----------------------------------------------------------------
 # Try to link PROGRAM.
 AC_DEFUN([AC_LINK_IFELSE],
-[AC_LANG_CONFTEST([$1])
+[m4_ifvanl([$1], [AC_LANG_CONFTEST([$1])])dnl
 if AC_TRY_EVAL(ac_link) && test -s conftest$ac_exeext; then
   m4_default([$2], :)
 else
   echo "configure: failed program was:" >&AC_FD_LOG
   cat conftest.$ac_ext >&AC_FD_LOG
-ifval([$3],
-[  $3
-])dnl
+m4_ifvanl([$3], [  $3])dnl
 fi
-rm -f conftest*[]dnl
+rm -f conftest.$ac_objext conftest$ac_exeext ifval([$1],
+                                                   [conftest.$ac_ext])[]dnl
 ])# AC_LINK_IFELSE
 
 
@@ -3362,18 +3359,17 @@ AC_LINK_IFELSE([AC_LANG_PROGRAM([[$2]], [[$3]])], [$4], [$5])
 # -----------------------------------------------------------
 # Compile, link, and run.
 AC_DEFUN([AC_RUN_IFELSE],
-[AC_LANG_CONFTEST([$1])
+[m4_ifvanl([$1], [AC_LANG_CONFTEST([$1])])dnl
 if AC_TRY_EVAL(ac_link) &&
    test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null; then
   m4_default([$2], :)
 else
   echo "configure: failed program was:" >&AC_FD_LOG
   cat conftest.$ac_ext >&AC_FD_LOG
-ifval([$3],
-[  $3
-])dnl
+m4_ifvanl([$3], [  $3])dnl
 fi
-rm -f conftest*[]dnl
+rm -f conftest.$ac_objext conftest$ac_exeext ifval([$1],
+                                                   [conftest.$ac_ext])[]dnl
 ])# AC_RUN_IFELSE
 
 
diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4
index c8a4002f1..80d1c466f 100644
--- a/lib/autoconf/general.m4
+++ b/lib/autoconf/general.m4
@@ -3283,17 +3283,15 @@ rm -f conftest*
 # --------------------------------------------------------------------
 # Try to compile PROGRAM.
 AC_DEFUN([AC_COMPILE_IFELSE],
-[AC_LANG_CONFTEST([$1])
+[m4_ifvanl([$1], [AC_LANG_CONFTEST([$1])])dnl
 if AC_TRY_EVAL(ac_compile) && test -s conftest.$ac_objext; then
   m4_default([$2], :)
 else
   echo "configure: failed program was:" >&AC_FD_LOG
   cat conftest.$ac_ext >&AC_FD_LOG
-ifval([$3],
-[  $3
-])dnl
+m4_ifvanl([$3],[  $3])dnl
 fi
-rm -f conftest*[]dnl
+rm -f conftest.$ac_objext ifval([$1], [conftest.$ac_ext])[]dnl
 ])# AC_COMPILE_IFELSE
 
 
@@ -3314,17 +3312,16 @@ AC_DEFUN([AC_TRY_COMPILE],
 # -----------------------------------------------------------------
 # Try to link PROGRAM.
 AC_DEFUN([AC_LINK_IFELSE],
-[AC_LANG_CONFTEST([$1])
+[m4_ifvanl([$1], [AC_LANG_CONFTEST([$1])])dnl
 if AC_TRY_EVAL(ac_link) && test -s conftest$ac_exeext; then
   m4_default([$2], :)
 else
   echo "configure: failed program was:" >&AC_FD_LOG
   cat conftest.$ac_ext >&AC_FD_LOG
-ifval([$3],
-[  $3
-])dnl
+m4_ifvanl([$3], [  $3])dnl
 fi
-rm -f conftest*[]dnl
+rm -f conftest.$ac_objext conftest$ac_exeext ifval([$1],
+                                                   [conftest.$ac_ext])[]dnl
 ])# AC_LINK_IFELSE
 
 
@@ -3362,18 +3359,17 @@ AC_LINK_IFELSE([AC_LANG_PROGRAM([[$2]], [[$3]])], [$4], [$5])
 # -----------------------------------------------------------
 # Compile, link, and run.
 AC_DEFUN([AC_RUN_IFELSE],
-[AC_LANG_CONFTEST([$1])
+[m4_ifvanl([$1], [AC_LANG_CONFTEST([$1])])dnl
 if AC_TRY_EVAL(ac_link) &&
    test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null; then
   m4_default([$2], :)
 else
   echo "configure: failed program was:" >&AC_FD_LOG
   cat conftest.$ac_ext >&AC_FD_LOG
-ifval([$3],
-[  $3
-])dnl
+m4_ifvanl([$3], [  $3])dnl
 fi
-rm -f conftest*[]dnl
+rm -f conftest.$ac_objext conftest$ac_exeext ifval([$1],
+                                                   [conftest.$ac_ext])[]dnl
 ])# AC_RUN_IFELSE