From bc3e912fae8941b8f499c90ceb8f570e1b6859f6 Mon Sep 17 00:00:00 2001
From: Albert Cheng <acheng@hdfgroup.org>
Date: Tue, 23 Nov 2004 16:38:48 -0500
Subject: [svn-r9566] Purpose: Improvement.

Description:
Change the default CC, F9X and CXX compilers from ecc/efc/ecc
to icc/ifort/icc because Intel keeps changing their compiler
names.  This eliminated the warning messages that a wrong
compiler name is used.

Platforms tested:
Tested in Tg-login NCSA only since that is the only
IA64 platform on site.
---
 c++/config/ia64-linux-gnu     |  4 ++--
 config/ia64-linux-gnu         |  8 ++++----
 fortran/config/ia64-linux-gnu | 10 +++++-----
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/c++/config/ia64-linux-gnu b/c++/config/ia64-linux-gnu
index 8d6d050..59799f6 100755
--- a/c++/config/ia64-linux-gnu
+++ b/c++/config/ia64-linux-gnu
@@ -1,7 +1,7 @@
 
 if test -z "$CXX"; then
-    CXX=ecc
-    CXX_BASENAME=ecc
+    CXX=icc
+    CXX_BASENAME=icc
 fi
 
 
diff --git a/config/ia64-linux-gnu b/config/ia64-linux-gnu
index 9234a7f..e0941df 100644
--- a/config/ia64-linux-gnu
+++ b/config/ia64-linux-gnu
@@ -5,9 +5,9 @@
 # the various compile modes.
 
 # Use Intel C compiler by default (if it's available).
-if test "X$CC" = "X" && which ecc > /dev/null; then
-    CC=ecc
-    CC_BASENAME=ecc
+if test "X$CC" = "X" && which icc > /dev/null; then
+    CC=icc
+    CC_BASENAME=icc
 fi
 
 #----------------------------------------------------------------------------
@@ -20,7 +20,7 @@ fi
 # out.)
 
 case $CC_BASENAME in
-    ecc)
+    ecc|icc)
 	# Default to C99 standard.
 	CFLAGS="${CFLAGS:--std=c99}"
 	DEBUG_CFLAGS="-w2 -Wall -g -O0"
diff --git a/fortran/config/ia64-linux-gnu b/fortran/config/ia64-linux-gnu
index 8c21110..7f0da2c 100644
--- a/fortran/config/ia64-linux-gnu
+++ b/fortran/config/ia64-linux-gnu
@@ -6,11 +6,11 @@
 
 # Use Intel C & Fortran compiler by default.
 if test "X-" =  "X-$CC"; then
-    CC=ecc
-    CC_BASENAME=ecc
+    CC=icc
+    CC_BASENAME=icc
 fi
 if test "X-" =  "X-$F9X"; then
-    F9X=efc
+    F9X=ifort
 fi
 
 #----------------------------------------------------------------------------
@@ -19,7 +19,7 @@ fi
 # `--enable-debug' switch of configure.
 
 case $CC_BASENAME in
-    ecc)
+    ecc|icc)
 	# CFLAGS must be set else configure set it to -g
 	CFLAGS="$CFLAGS"
 	DEBUG_CFLAGS="-g"
@@ -61,7 +61,7 @@ R_LARGE=18
 R_INTEGER=9
 
 case $F9X in
-    *efc)
+    *efc|*ifort)
 	# this is for efc v7.  Older efc do not work with these.
 	# -Vaxlib is for non-standard fortran calls like exit().
 	MORE_FFLAGS='-fpp -DDEC$=DEC_ -DMS$=MS_ -Vaxlib'
-- 
cgit v0.12