From 03849f6e43d52c0670bef3709eb115859fbb35c2 Mon Sep 17 00:00:00 2001 From: Eric Blake Date: Thu, 16 Sep 2010 16:19:11 -0600 Subject: [PATCH] fortran: avoid misparsed FCLIBS from Fortran compiler * lib/autoconf/fortran.m4 (_AC_PROG_FC_V_OUTPUT): Also skip 'Configured by:' lines from gfortran. * NEWS: Mention it. Reported by Stefano Lattarini. Signed-off-by: Eric Blake --- ChangeLog | 8 ++++++++ NEWS | 2 ++ lib/autoconf/fortran.m4 | 3 ++- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 5c80f7ca..d9911ba0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2010-09-16 Eric Blake + + fortran: avoid misparsed FCLIBS from Fortran compiler + * lib/autoconf/fortran.m4 (_AC_PROG_FC_V_OUTPUT): Also skip + 'Configured by:' lines from gfortran. + * NEWS: Mention it. + Reported by Stefano Lattarini. + 2010-09-16 Ralf Wildenhues Add autom4te trace for AM_PROG_AR. diff --git a/NEWS b/NEWS index 78851b96..f24b94ca 100644 --- a/NEWS +++ b/NEWS @@ -31,6 +31,8 @@ GNU Autoconf NEWS - User visible changes. ** AT_CHECK semantics with respect to the Autotest variable $at_status and shell execution environment of the arguments are documented now. +** AC_FC_LIBRARY_LDFLAGS now tolerates output from newer gfortran. + * Major changes in Autoconf 2.67 (2010-07-21) [stable] Released by Eric Blake, based on git versions 2.66.*. diff --git a/lib/autoconf/fortran.m4 b/lib/autoconf/fortran.m4 index e8f7bbcd..82a7a5d6 100644 --- a/lib/autoconf/fortran.m4 +++ b/lib/autoconf/fortran.m4 @@ -505,7 +505,8 @@ _AS_ECHO_LOG([$[*]]) # gfortran 4.3 outputs lines setting COLLECT_GCC_OPTIONS, COMPILER_PATH, # LIBRARY_PATH; skip all such settings. ac_[]_AC_LANG_ABBREV[]_v_output=`eval $ac_link AS_MESSAGE_LOG_FD>&1 2>&1 | - grep -v 'Driving:' | grep -v "^[[_$as_cr_Letters]][[_$as_cr_alnum]]*="` + sed '/^Driving:/d; /^Configured with:/d; + '"/^[[_$as_cr_Letters]][[_$as_cr_alnum]]*=/d"` AS_ECHO(["$ac_[]_AC_LANG_ABBREV[]_v_output"]) >&AS_MESSAGE_LOG_FD _AC_LANG_PREFIX[]FLAGS=$ac_save_[]_AC_LANG_PREFIX[]FLAGS -- 2.47.2