From afd2a0d7f3b88bfb058cd1c389f978acea182744 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Mon, 2 Jan 2012 11:22:25 -0800 Subject: [PATCH] autoconf: remove " -link" and ")" from xlf output * lib/autoconf/fortran.m4 (_AC_PROG_FC_V_OUTPUT): Also remove " -link" and trailing ")" from xlf output. Problem and fix reported by Thomas Jahns in . --- ChangeLog | 8 ++++++++ lib/autoconf/fortran.m4 | 11 +++++++++-- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0826f00d..9ab80680 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2012-01-02 Paul Eggert + + autoconf: remove " -link" and ")" from xlf output + * lib/autoconf/fortran.m4 (_AC_PROG_FC_V_OUTPUT): + Also remove " -link" and trailing ")" from xlf output. + Problem and fix reported by Thomas Jahns in + . + 2011-12-26 Stefano Lattarini configure: will re-execute with $CONFIG_SHELL, if it's set diff --git a/lib/autoconf/fortran.m4 b/lib/autoconf/fortran.m4 index e630f276..94eeef67 100644 --- a/lib/autoconf/fortran.m4 +++ b/lib/autoconf/fortran.m4 @@ -528,9 +528,16 @@ ac_[]_AC_LANG_ABBREV[]_v_output="`echo $ac_[]_AC_LANG_ABBREV[]_v_output | # that detects unbalanced quotes in FLIBS should be implemented # and (ugh) tested at some point. case $ac_[]_AC_LANG_ABBREV[]_v_output in - # If we are using xlf then replace all the commas with spaces. + # With xlf replace commas with spaces, + # and remove "-link" and closing parenthesis. *xlfentry*) - ac_[]_AC_LANG_ABBREV[]_v_output=`echo $ac_[]_AC_LANG_ABBREV[]_v_output | sed 's/,/ /g'` ;; + ac_[]_AC_LANG_ABBREV[]_v_output=`echo $ac_[]_AC_LANG_ABBREV[]_v_output | + sed ' + s/,/ /g + s/ -link / /g + s/) *$// + ' + ` ;; # With Intel ifc, ignore the quoted -mGLOB_options_string stuff (quoted # $LIBS confuse us, and the libraries appear later in the output anyway). -- 2.11.4.GIT