check for g95 in addition to gfortran

diff --git a/ChangeLog b/ChangeLog
index ac47db5d94a9e69ff9c4bbebdf47d1547d4d0800..d4c206825eb710f479c290108fd69052e8f3415c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-06-03  Steven G. Johnson  <stevenj@alum.mit.edu>
+
+       * lib/autoconf/fortran.m4 (_AC_PROG_FC): Find g95 in addition
+       to gfortran, and make these the first two compiler names
+       checked (following the general autoconf preference for gcc).
+
 2005-06-03  Stepan Kasal  <kasal@ucw.cz>
 
        * tests/Makefile.am (check_SCRIPTS): Set to $(wrappers).

diff --git a/lib/autoconf/fortran.m4 b/lib/autoconf/fortran.m4
index f4354d24dc00300332d3dba1e0f29c8cd47df04c..a6535a2683ddd07f482262ba9e27cc4d436e5269 100644 (file)
--- a/lib/autoconf/fortran.m4
+++ b/lib/autoconf/fortran.m4
@@ -333,7 +333,8 @@ AC_DEFUN([_AC_FC_DIALECT_YEAR],
 # Known compilers:
 #  f77/f90/f95: generic compiler names
 #  g77: GNU Fortran 77 compiler
-#  gfortran: putative GNU Fortran 95+ compiler (in progress)
+#  gfortran: GNU Fortran 95+ compiler (released in gcc 4.0)
+#  g95: original gcc-based f95 compiler (gfortran is a fork)
 #  ftn: native Fortran 95 compiler on Cray X1
 #  cf77: native F77 compiler under older Crays (prefer over fort77)
 #  fort77: native F77 compiler under HP-UX (and some older Crays)
@@ -347,7 +348,7 @@ AC_DEFUN([_AC_FC_DIALECT_YEAR],
 #  fort: Compaq (now HP) Fortran 90/95 compiler for Tru64 and Linux/Alpha
 #  ifort, previously ifc: Intel Fortran 95 compiler for Linux/x86
 #  efc: Intel Fortran 95 compiler for IA64
-m4_define([_AC_F95_FC], [f95 fort xlf95 ifort ifc efc pgf95 lf95 gfortran ftn])
+m4_define([_AC_F95_FC], [gfortran g95 f95 fort xlf95 ifort ifc efc pgf95 lf95 ftn])
 m4_define([_AC_F90_FC], [f90 xlf90 pgf90 pghpf epcf90])
 m4_define([_AC_F77_FC], [g77 f77 xlf frt pgf77 cf77 fort77 fl32 af77])
 AC_DEFUN([_AC_PROG_FC],