From 4014a60729e6c1f6484becf60a3e46faff26db68 Mon Sep 17 00:00:00 2001
From: Alexandre Duret-Lutz <adl@gnu.org>
Date: Thu, 3 Jun 2004 21:19:29 +0000
Subject: [PATCH] * 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.

---
 ChangeLog           |  6 ++++++
 tests/defs.in       |  6 +++---
 tests/depcomp5.test | 12 ++++++++++--
 3 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 8759f2b2..6ce8791a 100644
--- 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 036fcf2e..a384cb23 100644
--- 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 02e614bc..c9600cfa 100755
--- 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
-- 
2.43.5