From: Paul Eggert <eggert@cs.ucla.edu>
Date: Mon, 2 Jan 2012 19:22:25 +0000 (-0800)
Subject: autoconf: remove " -link" and ")" from xlf output
X-Git-Tag: v2.68b~36
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=afd2a0d7f3b88bfb058cd1c389f978acea182744;p=thirdparty%2Fautoconf.git

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>.
---

diff --git a/ChangeLog b/ChangeLog
index 0826f00dd..9ab80680f 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 e630f2765..94eeef67a 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).