* tests/defs.in (required=icc): Use `-V -help' instead of

`-V -dryrun'.  icc 8.0 fails on the latter.
* tests/depcomp5.test: Require depmode=icc for icc 7.x, and
depmod=gcc otherwise.
Report from Ralf Wildenhues.

diff --git a/ChangeLog b/ChangeLog
index 8759f2b22b230f428850a2a0befc95daece6c893..6ce8791ab141916b196fd98f4c9bc09db2bf2223 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2004-06-03  Alexandre Duret-Lutz  <adl@gnu.org>
 
+       * tests/defs.in (required=icc): Use `-V -help' instead of
+       `-V -dryrun'.  icc 8.0 fails on the latter.
+       * tests/depcomp5.test: Require depmode=icc for icc 7.x, and
+       depmod=gcc otherwise.
+       Report from Ralf Wildenhues.
+
        * lib/am/clean.am (distclean-generic): Do no
        `rm -f $(CONFIG_CLEAN_FILES)' if `$(CONFIG_CLEAN_FILES)' is empty.
        Report from Nicolas Joly.

diff --git a/tests/defs.in b/tests/defs.in
index 036fcf2e52abd9ecfe053a26e48b50eaa2cae98b..a384cb23969908711c6d0081b78cec5f09dfc88a 100644 (file)
--- a/tests/defs.in
+++ b/tests/defs.in
@@ -144,9 +144,9 @@ then
        # There is no way to ask *only* the compiler's version.
        # This tool always want to do something (by default
        # it will try link *nothing* and complain it cannot find
-       # main(); funny).  -dryrun is a workaround.
-       echo "$me: running $CC -V -dryrun"
-       ( $CC -V -dryrun ) || exit 77
+       # main(); funny).  Use -help so it does not try linking anything.
+       echo "$me: running $CC -V -help"
+       ( $CC -V -help ) || exit 77
        ;;
       makedepend)
        echo "$me: running makedepend -f-"

diff --git a/tests/depcomp5.test b/tests/depcomp5.test
index 02e614bc5176dbb85dfa0ecc21df53b5a35a48b6..c9600cfa0d1a5a5765fe2d4c59d8480c62230b45 100755 (executable)
--- a/tests/depcomp5.test
+++ b/tests/depcomp5.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2003  Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004  Free Software Foundation, Inc.
 #
 # This file is part of GNU Automake.
 #
@@ -23,6 +23,14 @@
 required='icc'
 . ./defs || exit 1
 
+# Automake supports icc since version 7.0 through a dedicated depcomp mode.
+# icc 8.0 and greater understand gcc options, so depmode is set to gcc.
+if icc -V -help 2>&1 | grep 'Version 7'; then
+  expect='depmode=icc'
+else
+  expect='depmode=gcc'
+fi
+
 set -e
 
 cat >> configure.in << 'END'
@@ -59,6 +67,6 @@ $AUTOCONF
 $AUTOMAKE -a
 
 ./configure
-grep 'depmode=icc' Makefile
+grep "$expect" Makefile
 $MAKE check
 $MAKE grepdeps