* tests/fortran.at (GNU Fortran 77): Also exercise AC_FC_SRCEXT

and AC_FC_FREEFORM.
* tests/mktests.sh: Skip AC_FC_SRCEXT.
* lib/autoconf/fortran.m4 (AC_FC_SRCEXT, AC_FC_FREEFORM): Likewise.

diff --git a/ChangeLog b/ChangeLog
index 3b5fb10fc224d6513bc3fd800c88da82e6d98dfb..6a2a7171f4b05248e38940056bb2e0629716cb7d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2003-09-10  Akim Demaille  <akim@epita.fr>
+
+       * tests/fortran.at (GNU Fortran 77): Also exercise AC_FC_SRCEXT
+       and AC_FC_FREEFORM.
+       * tests/mktests.sh: Skip AC_FC_SRCEXT.
+       * lib/autoconf/fortran.m4 (AC_FC_SRCEXT, AC_FC_FREEFORM): Likewise.
+
 2003-09-09  Akim Demaille  <akim@epita.fr>
 
        * lib/Autom4te/FileUtils.pm (&update_file): s/cannot not/cannot/g.

diff --git a/lib/autoconf/fortran.m4 b/lib/autoconf/fortran.m4
index 6492d3a42207029909949159213f865ce0016c6c..deaa82b25609bce5e27d5818f960ef8e7ede182e 100644 (file)
--- a/lib/autoconf/fortran.m4
+++ b/lib/autoconf/fortran.m4
@@ -1114,6 +1114,7 @@ for ac_flag in none -qsuffix=f=$1 -Tf; do
   test "x$ac_flag" != xnone && FCFLAGS_SRCEXT="$ac_flag"
   AC_COMPILE_IFELSE([AC_LANG_PROGRAM()], [ac_cv_fc_srcext_$1=$ac_flag; break])
 done
+rm -f conftest.$ac_objext conftest.$1
 FCFLAGS_SRCEXT=$ac_fc_srcext_FCFLAGS_SRCEXT_save
 AC_LANG_POP(Fortran)dnl
 ])
@@ -1133,8 +1134,9 @@ else
 fi
 ])# AC_FC_SRCEXT
 
+
 # AC_FC_FREEFORM([ACTION-IF-SUCCESS], [ACTION-IF-FAILURE])
-# ----------------------
+# --------------------------------------------------------
 # Look for a compiler flag to make the Fortran (FC) compiler accept
 # free-format source code, and adds it to FCFLAGS.  Call
 # ACTION-IF-SUCCESS (defaults to nothing) if successful (i.e. can
@@ -1157,6 +1159,7 @@ for ac_flag in none -free -freeform -ffree-form -qfree -Mfree -Mfreeform -FR; do
        end
 ], [ac_cv_fc_freeform=$ac_flag; break])
 done
+rm -f conftest.$ac_objext conftest.$ac_ext
 FCFLAGS=$ac_fc_freeform_FCFLAGS_save
 AC_LANG_POP(Fortran)dnl
 ])

diff --git a/tests/acfortran.at b/tests/acfortran.at
index a9eb18412809c139dbcf20b486bc02029a4f495d..6911aa45baf36f447e7499d0b0caf4c668ac5f1f 100644 (file)
--- a/tests/acfortran.at
+++ b/tests/acfortran.at
@@ -8,7 +8,6 @@ AT_CHECK_MACRO([AC_F77_MAIN])
 AT_CHECK_MACRO([AC_F77_WRAPPERS])
 AT_CHECK_MACRO([AC_FC_FREEFORM])
 AT_CHECK_MACRO([AC_FC_MAIN])
-AT_CHECK_MACRO([AC_FC_SRCEXT])
 AT_CHECK_MACRO([AC_FC_WRAPPERS])
 AT_CHECK_MACRO([AC_PROG_F77_C_O])
 AT_CHECK_MACRO([AC_PROG_FC_C_O])

diff --git a/tests/fortran.at b/tests/fortran.at
index 963acc62024624b9837130f66fc68f6338dc5ca2..9089e4cde6c518e8d4f30880f8183313b318a4f5 100644 (file)
--- a/tests/fortran.at
+++ b/tests/fortran.at
@@ -48,4 +48,18 @@ else
   # Has not.
   test "$G77" = yes &&
     AC_MSG_ERROR([incorrectly recognized a GNU Fortran 77 compiler])
-fi]])
+fi
+
+# No Fortran compiler is known not to support "*.f".
+AC_FC_SRCEXT([f])
+
+# GNU Fortran is known to support freeform.
+AC_FC_FREEFORM([],
+               [AC_MSG_WARN([Fortran does not accept free-form source])])
+if test $G77 = yes; then
+  case $FCFLAGS in
+   *-ffree-form*) ;;
+   *) AC_MSG_ERROR([failed to recognize G77's -ffree-form option.]);;
+  esac
+fi
+]])

diff --git a/tests/mktests.sh b/tests/mktests.sh
index 2e6908e6b3966ef1d52d42a14e2136f812218528..b5525fe54a6ed7aa35c9345b218aa0a995c2fb91 100755 (executable)
--- a/tests/mktests.sh
+++ b/tests/mktests.sh
@@ -98,7 +98,7 @@ exclude_list='^ac_cv_prog_(gcc|gxx|g77)$
 # - AC_LANG*
 #   Heavily used by other macros.
 #
-# - AC_PATH_PROGS?, AC_F77_FUNC, AC_FC_FUNC
+# - AC_PATH_PROGS?, AC_F77_FUNC, AC_FC_FUNC, AC_FC_SRCEXT
 #   They produce `= val' because $1, the variable used to store the result,
 #   is empty.
 #
@@ -131,6 +131,7 @@ ac_exclude_list='^AC_ARG_VAR$
 ^AC_CHECK_(DECL|FILE|FUNC|HEADER|LIB|MEMBER|PROG|SIZEOF|TOOL|TYPE)S?$
 ^AC_CONFIG
 ^AC_(F77|FC)_FUNC$
+^AC_FC_(FUNC|SRCEXT)$
 ^AC_FD_CC$
 ^AC_FUNC_(GETLOADAVG|FNMATCH_GNU|WAIT3)$
 ^AC_INIT