summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2012-01-02 11:22:25 -0800
committerPaul Eggert <eggert@cs.ucla.edu>2012-01-02 11:22:46 -0800
commitafd2a0d7f3b88bfb058cd1c389f978acea182744 (patch)
treebc8a015e8e4edfba45719f7676db245ca6197ff3
parent9663eea509264324e52b5c976d1315ac3347fe70 (diff)
downloadautoconf-afd2a0d7f3b88bfb058cd1c389f978acea182744.tar.gz
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 <http://lists.gnu.org/archive/html/bug-autoconf/2012-01/msg00000.html>.
-rw-r--r--ChangeLog8
-rw-r--r--lib/autoconf/fortran.m411
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 <eggert@cs.ucla.edu>
+
+ 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
+ <http://lists.gnu.org/archive/html/bug-autoconf/2012-01/msg00000.html>.
+
2011-12-26 Stefano Lattarini <stefano.lattarini@gmail.com>
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).