FYI: fix icc 8.0 dependency tracking (PR/416)

[Alexandre Duret-Lutz]

I'm installing this on HEAD and branch-1-8 and closing the PR.

2004-04-12  Alexandre Duret-Lutz  <address@hidden>

        Fix for PR automake/416:
        * m4/depend.m4 (_AM_DEPENDENCIES): Catch `not supported' ICC 8.0
        remarks.
        From Peter Seiderer.

Index: NEWS
===================================================================
RCS file: /cvs/automake/automake/NEWS,v
retrieving revision 1.256.2.38
diff -u -r1.256.2.38 NEWS
--- NEWS        10 Apr 2004 17:18:21 -0000      1.256.2.38
+++ NEWS        12 Apr 2004 16:52:19 -0000
@@ -8,6 +8,8 @@
   - Honor PATH_SEPARATOR in various places of the Automake package, for
     the sake of OS/2.
 
+  - Adjust dependency tracking mode detection to ICC 8.0's new output.
+
 * Bugs introduced by 1.8:
 
   - Fix an "internal error" when @LIBOBJS@ is used in a variable that is
Index: THANKS
===================================================================
RCS file: /cvs/automake/automake/THANKS,v
retrieving revision 1.230.2.16
diff -u -r1.230.2.16 THANKS
--- THANKS      26 Mar 2004 21:01:03 -0000      1.230.2.16
+++ THANKS      12 Apr 2004 16:52:20 -0000
@@ -194,6 +194,7 @@
 Peter Gavin            address@hidden
 Peter Mattis           address@hidden
 Peter Muir             address@hidden
+Peter Seiderer         address@hidden
 Petter Reinholdtsen    address@hidden
 Phil Edwards           address@hidden
 Phil Nelson            address@hidden
Index: m4/depend.m4
===================================================================
RCS file: /cvs/automake/automake/m4/depend.m4,v
retrieving revision 1.30.2.3
diff -u -r1.30.2.3 depend.m4
--- m4/depend.m4        29 Feb 2004 21:27:01 -0000      1.30.2.3
+++ m4/depend.m4        12 Apr 2004 16:52:20 -0000
@@ -115,9 +115,14 @@
        grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
        ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
       # icc doesn't choke on unknown options, it will just issue warnings
-      # (even with -Werror).  So we grep stderr for any message
-      # that says an option was ignored.
-      if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else
+      # or remarks (even with -Werror).  So we grep stderr for any message
+      # that says an option was ignored or not supported.
+      # When given -MP, icc 7.0 and 7.1 complain thusly:
+      #   icc: Command line warning: ignoring option '-M'; no argument required
+      # The diagnosis changed in icc 8.0:
+      #   icc: Command line remark: option '-MP' not supported
+      if (grep 'ignoring option' conftest.err ||
+          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
         am_cv_$1_dependencies_compiler_type=$depmode
         break
       fi

-- 
Alexandre Duret-Lutz