From: Akim Demaille <akim@epita.fr>
Date: Wed, 6 Sep 2000 13:05:58 +0000 (+0000)
Subject: * acspecific.m4 (_AC_OBJEXT): No longer use AC_COMPILE_IFELSE,
X-Git-Tag: autoconf-2.50~644
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d2cb51aef44d1b7a1249174e0e8de0cffb68b29f;p=thirdparty%2Fautoconf.git

* acspecific.m4 (_AC_OBJEXT): No longer use AC_COMPILE_IFELSE,
which uses $ac_objext hence depends upon _AC_OBJEXT.
* aclang.m4 (AC_PROG_CC, AC_PROG_CXX, AC_PROG_F77): Call
_AC_EXEEXT before _AC_OBJEXT since the former needs $ac_objext.
---

diff --git a/ChangeLog b/ChangeLog
index ecc6518f9..b6b11fdde 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2000-09-06   Morten Eriksen  <mortene@sim.no>
+
+	* acspecific.m4 (_AC_OBJEXT): No longer use AC_COMPILE_IFELSE,
+	which uses $ac_objext hence depends upon _AC_OBJEXT.
+	* aclang.m4 (AC_PROG_CC, AC_PROG_CXX, AC_PROG_F77): Call
+	_AC_EXEEXT before _AC_OBJEXT since the former needs $ac_objext.
+
 2000-09-06  Bernard Dautrevaux  <dautrevaux@objectlive.com>
 
 	* acspecific.m4 (_AC_EXEEXT): Set extension to void if linking
diff --git a/aclang.m4 b/aclang.m4
index 9c1ad0036..351cb84f3 100644
--- a/aclang.m4
+++ b/aclang.m4
@@ -238,7 +238,7 @@ AU_DEFUN([AC_LANG_FORTRAN77], [AC_LANG(Fortran 77)])
 
 # AC_LANG_CONFTEST(BODY)
 # ---------------------
-# Save the BODY in `conftest.$acext'.  Add a trailing new line.
+# Save the BODY in `conftest.$ac_ext'.  Add a trailing new line.
 define([AC_LANG_CONFTEST],
 [cat >conftest.$ac_ext <<_ACEOF
 $1
@@ -610,8 +610,8 @@ test -z "$CC" && AC_MSG_ERROR([no acceptable cc found in \$PATH])
 _AC_LANG_COMPILER_WORKS
 _AC_PROG_CC_GNU
 _AC_PROG_CC_G
-AC_EXPAND_ONCE([_AC_EXEEXT])
 AC_EXPAND_ONCE([_AC_OBJEXT])
+AC_EXPAND_ONCE([_AC_EXEEXT])
 AC_LANG_POP
 ])# AC_PROG_CC
 
@@ -802,8 +802,8 @@ AC_CHECK_TOOLS(CXX,
 _AC_LANG_COMPILER_WORKS
 _AC_PROG_CXX_GNU
 _AC_PROG_CXX_G
-AC_EXPAND_ONCE([_AC_EXEEXT])
 AC_EXPAND_ONCE([_AC_OBJEXT])
+AC_EXPAND_ONCE([_AC_EXEEXT])
 AC_LANG_POP
 ])# AC_PROG_CXX
 
@@ -901,9 +901,8 @@ AC_CHECK_TOOLS(F77,
 _AC_LANG_COMPILER_WORKS
 _AC_PROG_F77_GNU
 _AC_PROG_F77_G
-
-AC_EXPAND_ONCE([_AC_EXEEXT])
 AC_EXPAND_ONCE([_AC_OBJEXT])
+AC_EXPAND_ONCE([_AC_EXEEXT])
 AC_LANG_POP
 ])# AC_PROG_F77
 
diff --git a/acspecific.m4 b/acspecific.m4
index d7b589f1f..b1715fb4b 100644
--- a/acspecific.m4
+++ b/acspecific.m4
@@ -1588,16 +1588,22 @@ AC_SUBST(EXEEXT)dnl
 # determined by ac_objext.
 define([_AC_OBJEXT],
 [AC_CACHE_CHECK([for object suffix], ac_cv_objext,
-[AC_COMPILE_IFELSE([AC_LANG_PROGRAM()],
-   [for ac_file in conftest.*; do
-    case $ac_file in
-      *.$ac_ext) ;;
-      *) ac_cv_objext=`echo $ac_file | sed s/conftest.//` ;;
-    esac
-  done],
-   [AC_MSG_ERROR([cannot compile])])])
+[AC_LANG_CONFTEST([AC_LANG_PROGRAM()])
+ if AC_TRY_EVAL(ac_compile); then
+   for ac_file in conftest.*; do
+   case $ac_file in
+     *.$ac_ext) ;;
+     *) ac_cv_objext=`echo $ac_file | sed s/conftest.//` ;;
+   esac
+   done
+ else
+   rm -f conftest.$ac_ext
+   AC_MSG_ERROR([cannot compile])
+ fi
+])
 AC_SUBST(OBJEXT, $ac_cv_objext)dnl
 ac_objext=$ac_cv_objext
+rm -f conftest.$ac_objext conftest.$ac_ext
 ])# _AC_OBJEXT
 
 
diff --git a/lib/autoconf/c.m4 b/lib/autoconf/c.m4
index 9c1ad0036..351cb84f3 100644
--- a/lib/autoconf/c.m4
+++ b/lib/autoconf/c.m4
@@ -238,7 +238,7 @@ AU_DEFUN([AC_LANG_FORTRAN77], [AC_LANG(Fortran 77)])
 
 # AC_LANG_CONFTEST(BODY)
 # ---------------------
-# Save the BODY in `conftest.$acext'.  Add a trailing new line.
+# Save the BODY in `conftest.$ac_ext'.  Add a trailing new line.
 define([AC_LANG_CONFTEST],
 [cat >conftest.$ac_ext <<_ACEOF
 $1
@@ -610,8 +610,8 @@ test -z "$CC" && AC_MSG_ERROR([no acceptable cc found in \$PATH])
 _AC_LANG_COMPILER_WORKS
 _AC_PROG_CC_GNU
 _AC_PROG_CC_G
-AC_EXPAND_ONCE([_AC_EXEEXT])
 AC_EXPAND_ONCE([_AC_OBJEXT])
+AC_EXPAND_ONCE([_AC_EXEEXT])
 AC_LANG_POP
 ])# AC_PROG_CC
 
@@ -802,8 +802,8 @@ AC_CHECK_TOOLS(CXX,
 _AC_LANG_COMPILER_WORKS
 _AC_PROG_CXX_GNU
 _AC_PROG_CXX_G
-AC_EXPAND_ONCE([_AC_EXEEXT])
 AC_EXPAND_ONCE([_AC_OBJEXT])
+AC_EXPAND_ONCE([_AC_EXEEXT])
 AC_LANG_POP
 ])# AC_PROG_CXX
 
@@ -901,9 +901,8 @@ AC_CHECK_TOOLS(F77,
 _AC_LANG_COMPILER_WORKS
 _AC_PROG_F77_GNU
 _AC_PROG_F77_G
-
-AC_EXPAND_ONCE([_AC_EXEEXT])
 AC_EXPAND_ONCE([_AC_OBJEXT])
+AC_EXPAND_ONCE([_AC_EXEEXT])
 AC_LANG_POP
 ])# AC_PROG_F77
 
diff --git a/lib/autoconf/fortran.m4 b/lib/autoconf/fortran.m4
index 9c1ad0036..351cb84f3 100644
--- a/lib/autoconf/fortran.m4
+++ b/lib/autoconf/fortran.m4
@@ -238,7 +238,7 @@ AU_DEFUN([AC_LANG_FORTRAN77], [AC_LANG(Fortran 77)])
 
 # AC_LANG_CONFTEST(BODY)
 # ---------------------
-# Save the BODY in `conftest.$acext'.  Add a trailing new line.
+# Save the BODY in `conftest.$ac_ext'.  Add a trailing new line.
 define([AC_LANG_CONFTEST],
 [cat >conftest.$ac_ext <<_ACEOF
 $1
@@ -610,8 +610,8 @@ test -z "$CC" && AC_MSG_ERROR([no acceptable cc found in \$PATH])
 _AC_LANG_COMPILER_WORKS
 _AC_PROG_CC_GNU
 _AC_PROG_CC_G
-AC_EXPAND_ONCE([_AC_EXEEXT])
 AC_EXPAND_ONCE([_AC_OBJEXT])
+AC_EXPAND_ONCE([_AC_EXEEXT])
 AC_LANG_POP
 ])# AC_PROG_CC
 
@@ -802,8 +802,8 @@ AC_CHECK_TOOLS(CXX,
 _AC_LANG_COMPILER_WORKS
 _AC_PROG_CXX_GNU
 _AC_PROG_CXX_G
-AC_EXPAND_ONCE([_AC_EXEEXT])
 AC_EXPAND_ONCE([_AC_OBJEXT])
+AC_EXPAND_ONCE([_AC_EXEEXT])
 AC_LANG_POP
 ])# AC_PROG_CXX
 
@@ -901,9 +901,8 @@ AC_CHECK_TOOLS(F77,
 _AC_LANG_COMPILER_WORKS
 _AC_PROG_F77_GNU
 _AC_PROG_F77_G
-
-AC_EXPAND_ONCE([_AC_EXEEXT])
 AC_EXPAND_ONCE([_AC_OBJEXT])
+AC_EXPAND_ONCE([_AC_EXEEXT])
 AC_LANG_POP
 ])# AC_PROG_F77
 
diff --git a/lib/autoconf/lang.m4 b/lib/autoconf/lang.m4
index 9c1ad0036..351cb84f3 100644
--- a/lib/autoconf/lang.m4
+++ b/lib/autoconf/lang.m4
@@ -238,7 +238,7 @@ AU_DEFUN([AC_LANG_FORTRAN77], [AC_LANG(Fortran 77)])
 
 # AC_LANG_CONFTEST(BODY)
 # ---------------------
-# Save the BODY in `conftest.$acext'.  Add a trailing new line.
+# Save the BODY in `conftest.$ac_ext'.  Add a trailing new line.
 define([AC_LANG_CONFTEST],
 [cat >conftest.$ac_ext <<_ACEOF
 $1
@@ -610,8 +610,8 @@ test -z "$CC" && AC_MSG_ERROR([no acceptable cc found in \$PATH])
 _AC_LANG_COMPILER_WORKS
 _AC_PROG_CC_GNU
 _AC_PROG_CC_G
-AC_EXPAND_ONCE([_AC_EXEEXT])
 AC_EXPAND_ONCE([_AC_OBJEXT])
+AC_EXPAND_ONCE([_AC_EXEEXT])
 AC_LANG_POP
 ])# AC_PROG_CC
 
@@ -802,8 +802,8 @@ AC_CHECK_TOOLS(CXX,
 _AC_LANG_COMPILER_WORKS
 _AC_PROG_CXX_GNU
 _AC_PROG_CXX_G
-AC_EXPAND_ONCE([_AC_EXEEXT])
 AC_EXPAND_ONCE([_AC_OBJEXT])
+AC_EXPAND_ONCE([_AC_EXEEXT])
 AC_LANG_POP
 ])# AC_PROG_CXX
 
@@ -901,9 +901,8 @@ AC_CHECK_TOOLS(F77,
 _AC_LANG_COMPILER_WORKS
 _AC_PROG_F77_GNU
 _AC_PROG_F77_G
-
-AC_EXPAND_ONCE([_AC_EXEEXT])
 AC_EXPAND_ONCE([_AC_OBJEXT])
+AC_EXPAND_ONCE([_AC_EXEEXT])
 AC_LANG_POP
 ])# AC_PROG_F77
 
diff --git a/lib/autoconf/specific.m4 b/lib/autoconf/specific.m4
index d7b589f1f..b1715fb4b 100644
--- a/lib/autoconf/specific.m4
+++ b/lib/autoconf/specific.m4
@@ -1588,16 +1588,22 @@ AC_SUBST(EXEEXT)dnl
 # determined by ac_objext.
 define([_AC_OBJEXT],
 [AC_CACHE_CHECK([for object suffix], ac_cv_objext,
-[AC_COMPILE_IFELSE([AC_LANG_PROGRAM()],
-   [for ac_file in conftest.*; do
-    case $ac_file in
-      *.$ac_ext) ;;
-      *) ac_cv_objext=`echo $ac_file | sed s/conftest.//` ;;
-    esac
-  done],
-   [AC_MSG_ERROR([cannot compile])])])
+[AC_LANG_CONFTEST([AC_LANG_PROGRAM()])
+ if AC_TRY_EVAL(ac_compile); then
+   for ac_file in conftest.*; do
+   case $ac_file in
+     *.$ac_ext) ;;
+     *) ac_cv_objext=`echo $ac_file | sed s/conftest.//` ;;
+   esac
+   done
+ else
+   rm -f conftest.$ac_ext
+   AC_MSG_ERROR([cannot compile])
+ fi
+])
 AC_SUBST(OBJEXT, $ac_cv_objext)dnl
 ac_objext=$ac_cv_objext
+rm -f conftest.$ac_objext conftest.$ac_ext
 ])# _AC_OBJEXT