From: Alexandre Duret-Lutz Date: Mon, 12 Apr 2004 16:59:09 +0000 (+0000) Subject: Fix for PR automake/416: X-Git-Tag: Release-1-8b~41 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=61dbc304b53d20703de8cdcb883d6efd3a18c311;p=thirdparty%2Fautomake.git 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 e4f91d1f8..5b7dfe504 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2004-04-12 Alexandre Duret-Lutz + + 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 * aclocal.in, automake.in, configure.ac, Makefile.am, diff --git a/THANKS b/THANKS index e20d50b17..73cc5a9bc 100644 --- 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 fe5fee449..24a9a269d 100644 --- 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