diff options
| author | Alexandre Duret-Lutz <adl@gnu.org> | 2004-04-12 16:59:25 +0000 |
|---|---|---|
| committer | Alexandre Duret-Lutz <adl@gnu.org> | 2004-04-12 16:59:25 +0000 |
| commit | d8691c7dd381aef79e2f23815949f9528405904a (patch) | |
| tree | 21e7a86545350fb563260ab0aa21e97a7b59dee9 | |
| parent | 3461234346e48d162b8811954c6da16520621ab6 (diff) | |
| download | automake-d8691c7dd381aef79e2f23815949f9528405904a.tar.gz | |
Fix for PR automake/416:
* m4/depend.m4 (_AM_DEPENDENCIES): Catch `not supported' ICC 8.0
remarks.
From Peter Seiderer.
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | NEWS | 3 | ||||
| -rw-r--r-- | THANKS | 1 | ||||
| -rw-r--r-- | m4/depend.m4 | 11 |
4 files changed, 19 insertions, 3 deletions
@@ -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, @@ -8,6 +8,9 @@ Bugs fixed in 1.8.3a: - 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. + (PR/416) + * Bugs introduced by 1.8: - Fix an "internal error" when @LIBOBJS@ is used in a variable that is @@ -194,6 +194,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 |