Fix for PR automake/416:

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

diff --git a/ChangeLog b/ChangeLog
index e4f91d1f84cfad0677106d0e1bdc63824983bfa9..5b7dfe5049dec5027469ba7d579d992930abb14f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2004-04-12  Alexandre Duret-Lutz  <adl@gnu.org>
+
+       Fix for PR automake/416:
+       * m4/depend.m4 (_AM_DEPENDENCIES): Catch `not supported' ICC 8.0
+       remarks.
+       From Peter Seiderer.
+
 2004-04-10  Andreas Buening  <andreas.buening@nexgo.de>
 
        * aclocal.in, automake.in, configure.ac, Makefile.am,

diff --git a/THANKS b/THANKS
index e20d50b171d23280a9b2e8e91d857065a452184a..73cc5a9bc31dd6bc61ef46acf4d015b114723432 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -195,6 +195,7 @@ Peter Eisentraut    peter_e@gmx.net
 Peter Gavin            pgavin@debaser.kicks-ass.org
 Peter Mattis           petm@scam.XCF.Berkeley.EDU
 Peter Muir             iyhi@yahoo.com
+Peter Seiderer         seiderer123@ciselant.de
 Petter Reinholdtsen    pere@hungry.com
 Phil Edwards           phil@jaj.com
 Phil Nelson            phil@cs.wwu.edu

diff --git a/m4/depend.m4 b/m4/depend.m4
index fe5fee449d202d4c3f6cd4bdae7e3a4043665c82..24a9a269dbb0cd923293f4a2bfa3e605f0fc5dbb 100644 (file)
--- a/m4/depend.m4
+++ b/m4/depend.m4
@@ -115,9 +115,14 @@ AC_CACHE_CHECK([dependency style of $depcc],
        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