From 76d6383e5a4ab9f16d7e5afcfb3e852afbb9e140 Mon Sep 17 00:00:00 2001
From: Stepan Kasal <kasal@ucw.cz>
Date: Thu, 27 Oct 2005 06:16:02 +0000
Subject: [PATCH] "conftst2" -> "conftest2"

---
 ChangeLog               |  5 +++++
 lib/autoconf/c.m4       | 20 ++++++++++----------
 lib/autoconf/fortran.m4 | 12 ++++--------
 3 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 0c80462f..1e1f1b69 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-10-27  Stepan Kasal  <kasal@ucw.cz>
+
+	* lib/autoconf/c.m4 (AC_PROG_CC_C_O): "conftst2" -> "conftest2"
+	* lib/autoconf/fortran.m4 (_AC_PROG_FC_C_O): Likewise.
+
 2005-10-25  Stepan Kasal  <kasal@ucw.cz>
 
 	* lib/autoconf/c.m4 (AC_PROG_CC_C_O): rm -f conftst2.*, not only
diff --git a/lib/autoconf/c.m4 b/lib/autoconf/c.m4
index 4c54128f..25936092 100644
--- a/lib/autoconf/c.m4
+++ b/lib/autoconf/c.m4
@@ -576,24 +576,25 @@ set dummy $CC; ac_cc=`echo $[2] |
 		      sed 's/[[^a-zA-Z0-9_]]/_/g;s/^[[0-9]]/_/'`
 AC_CACHE_VAL(ac_cv_prog_cc_${ac_cc}_c_o,
 [AC_LANG_CONFTEST([AC_LANG_PROGRAM([])])
-ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files conftst2.*"
 # Make sure it works both with $CC and with simple cc.
 # We do the test twice because some compilers refuse to overwrite an
 # existing .o file with -o, though they will create one.
-ac_try='$CC -c conftest.$ac_ext -o conftst2.$ac_objext >&AS_MESSAGE_LOG_FD'
-rm -f conftst2.*
+# (On an 8+3 filesystem, conftest2.* is not distinguishable from conftest.*,
+# thus the test always passes; but if the ./configure scripts are ever run
+# on good old DOS, it has to be with DJGPP, thus with gcc.)
+ac_try='$CC -c conftest.$ac_ext -o conftest2.$ac_objext >&AS_MESSAGE_LOG_FD'
+rm -f conftest2.*
 if AC_TRY_EVAL(ac_try) &&
-   test -f conftst2.$ac_objext && AC_TRY_EVAL(ac_try);
+   test -f conftest2.$ac_objext && AC_TRY_EVAL(ac_try);
 then
   eval ac_cv_prog_cc_${ac_cc}_c_o=yes
   if test "x$CC" != xcc; then
     # Test first that cc exists at all.
     if AC_TRY_COMMAND(cc -c conftest.$ac_ext >&AS_MESSAGE_LOG_FD); then
-      ac_try='cc -c conftest.$ac_ext -o conftst2.$ac_objext >&AS_MESSAGE_LOG_FD'
-      rm -f conftst2.*
+      ac_try='cc -c conftest.$ac_ext -o conftest2.$ac_objext >&AS_MESSAGE_LOG_FD'
+      rm -f conftest2.*
       if AC_TRY_EVAL(ac_try) &&
-	 test -f conftst2.$ac_objext && AC_TRY_EVAL(ac_try);
+	 test -f conftest2.$ac_objext && AC_TRY_EVAL(ac_try);
       then
 	# cc works too.
 	:
@@ -606,8 +607,7 @@ then
 else
   eval ac_cv_prog_cc_${ac_cc}_c_o=no
 fi
-rm -f conftest* conftst2.*
-ac_clean_files=$ac_clean_files_save
+rm -f conftest*
 ])dnl
 if eval "test \"`echo '$ac_cv_prog_cc_'${ac_cc}_c_o`\" = yes"; then
   AC_MSG_RESULT([yes])
diff --git a/lib/autoconf/fortran.m4 b/lib/autoconf/fortran.m4
index 59250a4b..369d90ba 100644
--- a/lib/autoconf/fortran.m4
+++ b/lib/autoconf/fortran.m4
@@ -459,22 +459,18 @@ AC_DEFUN([_AC_PROG_FC_C_O],
 AC_CACHE_CHECK([whether $[]_AC_FC[] understands -c and -o together],
                [ac_cv_prog_[]_AC_LANG_ABBREV[]_c_o],
 [AC_LANG_CONFTEST([AC_LANG_PROGRAM([])])
-ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files conftst2.*"
 # We test twice because some compilers refuse to overwrite an existing
 # `.o' file with `-o', although they will create one.
-ac_try='$[]_AC_FC[] $[]_AC_LANG_PREFIX[]FLAGS -c conftest.$ac_ext -o conftst2.$ac_objext >&AS_MESSAGE_LOG_FD'
-rm -f conftst2.*
+ac_try='$[]_AC_FC[] $[]_AC_LANG_PREFIX[]FLAGS -c conftest.$ac_ext -o conftest2.$ac_objext >&AS_MESSAGE_LOG_FD'
+rm -f conftest2.*
 if AC_TRY_EVAL(ac_try) &&
-     test -f conftst2.$ac_objext &&
+     test -f conftest2.$ac_objext &&
      AC_TRY_EVAL(ac_try); then
   ac_cv_prog_[]_AC_LANG_ABBREV[]_c_o=yes
 else
   ac_cv_prog_[]_AC_LANG_ABBREV[]_c_o=no
 fi
-rm -f conftest* conftst2.*
-ac_clean_files=$ac_clean_files_save
-])
+rm -f conftest*])
 if test $ac_cv_prog_[]_AC_LANG_ABBREV[]_c_o = no; then
   AC_DEFINE([]_AC_FC[]_NO_MINUS_C_MINUS_O, 1,
             [Define to 1 if your Fortran compiler doesn't accept