From cc2118d83698708c7c0334ad72f2cd03c4f81f0b Mon Sep 17 00:00:00 2001 From: Giulio Paci Date: Sat, 12 Feb 2011 11:30:32 +0100 Subject: [PATCH] Fix detection of link flags for fort77 on GNU/Linux. * lib/autoconf/fortran.m4 (_AC_PROG_FC_V_OUTPUT): Properly detect the fort77 (f2c wrapper) compiler verbose linking output flag. Fixes also AC_F77_LIBRARY_LDFLAGS and AC_F77_DUMMY_MAIN. * THANKS: Update. Signed-off-by: Ralf Wildenhues --- ChangeLog | 9 +++++++++ THANKS | 1 + lib/autoconf/fortran.m4 | 10 ++++++++++ 3 files changed, 20 insertions(+) diff --git a/ChangeLog b/ChangeLog index 1ef7b165..6f0b93d4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2011-02-12 Giulio Paci (tiny change) + Ralf Wildenhues + + Fix detection of link flags for fort77 on GNU/Linux. + * lib/autoconf/fortran.m4 (_AC_PROG_FC_V_OUTPUT): Properly detect + the fort77 (f2c wrapper) compiler verbose linking output flag. + Fixes also AC_F77_LIBRARY_LDFLAGS and AC_F77_DUMMY_MAIN. + * THANKS: Update. + 2011-02-07 Ralf Wildenhues * doc/autoconf.texi: Rebuild menus using emacs ^C ^U ^A. diff --git a/THANKS b/THANKS index f0638bd7..079be662 100644 --- a/THANKS +++ b/THANKS @@ -151,6 +151,7 @@ Greg A. Woods woods@weird.com Greg Schafer gschafer@zip.com.au Gregorio Guidi ? Gregory Giannoni sand@narguile.org +Giulio Paci giuliopaci@interfree.it Guido Draheim Guido.Draheim@gmx.de Guido Flohr gufl0000@stud.uni-sb.de Guido van Rossum ? diff --git a/lib/autoconf/fortran.m4 b/lib/autoconf/fortran.m4 index bed9c96b..d5afbb98 100644 --- a/lib/autoconf/fortran.m4 +++ b/lib/autoconf/fortran.m4 @@ -540,6 +540,16 @@ case $ac_[]_AC_LANG_ABBREV[]_v_output in s/-ignore *'[[^']]*'/ /g; s/-ignore *\"[[^\"]]*\"/ /g s/-def *'[[^']]*'/ /g; s/-def *\"[[^\"]]*\"/ /g"` ;; + # If we are using fort77 (the f2c wrapper) then filter output and delete quotes. + *fort77*f2c*gcc*) + ac_[]_AC_LANG_ABBREV[]_v_output=`echo "$ac_[]_AC_LANG_ABBREV[]_v_output" | sed -n ' + /:[[ ]]\+Running[[ ]]\{1,\}"gcc"/{ + /"-c"/d + /[[.]]c"*/d + s/^.*"gcc"/"gcc"/ + s/"//gp + }'` ;; + # If we are using Cray Fortran then delete quotes. *cft90*) ac_[]_AC_LANG_ABBREV[]_v_output=`echo $ac_[]_AC_LANG_ABBREV[]_v_output | sed 's/"//g'` ;;