Index: fortran.m4
===================================================================
RCS file: /cvs/autoconf/lib/autoconf/fortran.m4,v
retrieving revision 1.177
diff -u -r1.177 fortran.m4
--- fortran.m4	7 Oct 2003 17:02:39 -0000	1.177
+++ fortran.m4	8 Oct 2003 23:29:06 -0000
@@ -524,9 +524,9 @@
 rm -f conftest*
 
 # If we are using xlf then replace all the commas with spaces.
-if echo $ac_[]_AC_LANG_ABBREV[]_v_output | grep xlfentry >/dev/null 2>&1; then
+case $ac_[]_AC_LANG_ABBREV[]_v_output in *xlfentry*)
   ac_[]_AC_LANG_ABBREV[]_v_output=`echo $ac_[]_AC_LANG_ABBREV[]_v_output | sed 's/,/ /g'`
-fi
+;; esac
 
 # On HP/UX there is a line like: "LPATH is: /foo:/bar:/baz" where
 # /foo, /bar, and /baz are search directories for the Fortran linker.
@@ -535,12 +535,18 @@
 	grep 'LPATH is:' |
 	sed 's,.*LPATH is\(: *[[^ ]]*\).*,\1,;s,: */, -L/,g'` $ac_[]_AC_LANG_ABBREV[]_v_output"
 
+# With Intel ifc, ignore the quoted -mGLOB_options_string stuff (quoted
+# $LIBS confuse us, and the libraries appear later in the output anyway).
+case $ac_[]_AC_LANG_ABBREV[]_v_output in *mGLOB_options_string*)
+  ac_[]_AC_LANG_ABBREV[]_v_output=`echo $ac_[]_AC_LANG_ABBREV[]_v_output | sed 's/\"-mGLOB[[^\"]]*\"/ /g'`
+;; esac
+
 # If we are using Cray Fortran then delete quotes.
 # Use "\"" instead of '"' for font-lock-mode.
 # FIXME: a more general fix for quoted arguments with spaces?
-if echo $ac_[]_AC_LANG_ABBREV[]_v_output | grep cft90 >/dev/null 2>&1; then
+case $ac_[]_AC_LANG_ABBREV[]_v_output in *cft90*)
   ac_[]_AC_LANG_ABBREV[]_v_output=`echo $ac_[]_AC_LANG_ABBREV[]_v_output | sed "s/\"//g"`
-fi[]dnl
+;; esac[]dnl
 ])# _AC_PROG_FC_V_OUTPUT