From: Ralf Wildenhues Date: Tue, 5 Sep 2006 17:17:31 +0000 (+0000) Subject: * lib/autoconf/fortran.m4 (_AC_PROG_FC): Prefer xlf90/xlf95 over X-Git-Tag: AUTOCONF-2.60b~56 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cd5882df0feccab953f9e09f768434e7a57513d9;p=thirdparty%2Fautoconf.git * lib/autoconf/fortran.m4 (_AC_PROG_FC): Prefer xlf90/xlf95 over f90/f95 because the latter drivers of AIX Fortran 9.1 do not accept files with extension `.f'. For consistency, also prefer xlf over f77. * doc/autoconf.texi (Fortran Compiler): Remove mention of bug from last patch. --- diff --git a/ChangeLog b/ChangeLog index cb5d0eacc..d6808e476 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2006-09-05 Ralf Wildenhues + + * lib/autoconf/fortran.m4 (_AC_PROG_FC): Prefer xlf90/xlf95 over + f90/f95 because the latter drivers of AIX Fortran 9.1 do not + accept files with extension `.f'. For consistency, also prefer + xlf over f77. + * doc/autoconf.texi (Fortran Compiler): Remove mention of bug + from last patch. + 2006-09-05 Romain Lenglet * lib/autoconf/erlang.m4 (AC_ERLANG_CHECK_LIB): Added substitution diff --git a/doc/autoconf.texi b/doc/autoconf.texi index 380da694a..88705cc62 100644 --- a/doc/autoconf.texi +++ b/doc/autoconf.texi @@ -6852,9 +6852,6 @@ If the output variable @code{FCFLAGS} was not already set in the environment, then set it to @option{-g -02} for @acronym{GNU} @code{g77} (or @option{-O2} where @code{g77} does not accept @option{-g}). Otherwise, set @code{FCFLAGS} to @option{-g} for all other Fortran compilers. - -Because of a bug in Autoconf, you should invoke @code{AC_PROG_CC} before -invoking @code{AC_PROG_FC}. @end defmac @defmac AC_PROG_F77_C_O diff --git a/lib/autoconf/fortran.m4 b/lib/autoconf/fortran.m4 index 45ce9ab37..1ade02063 100644 --- a/lib/autoconf/fortran.m4 +++ b/lib/autoconf/fortran.m4 @@ -341,6 +341,8 @@ AC_DEFUN([_AC_FC_DIALECT_YEAR], # frt: Fujitsu F77 compiler # pgf77/pgf90/pghpf/pgf95: Portland Group F77/F90/F95 compilers # xlf/xlf90/xlf95: IBM (AIX) F77/F90/F95 compilers +# Prefer xlf9x to the generic names because they do not reject file +# with extension `.f'. # lf95: Lahey-Fujitsu F95 compiler # fl32: Microsoft Fortran 77 "PowerStation" compiler # af77: Apogee F77 compiler for Intergraph hardware running CLIX @@ -348,9 +350,9 @@ 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], [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]) +m4_define([_AC_F95_FC], [gfortran g95 xlf95 f95 fort ifort ifc efc pgf95 lf95 ftn]) +m4_define([_AC_F90_FC], [xlf90 f90 pgf90 pghpf epcf90]) +m4_define([_AC_F77_FC], [g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77]) AC_DEFUN([_AC_PROG_FC], [_AC_FORTRAN_ASSERT()dnl AC_CHECK_TOOLS([]_AC_FC[],