From 90d937946ff1483f8267320d18b7ee2eab28eb82 Mon Sep 17 00:00:00 2001
From: Quincey Koziol <koziol@hdfgroup.org>
Date: Fri, 3 Dec 2004 13:08:14 -0500
Subject: [svn-r9611] Purpose:     Bug fix

Description:
    Correct typo in ia64 configure script.

    Update intel compiler detection to handle Itanium versions of compilers

Platforms tested:
    Teragrid machine (tg-login) w/icc 7.1 & 8.x
    Linux 2.4 (verbena) w/icc
---
 config/ia64-linux-gnu | 13 +++----------
 config/intel-flags    |  2 +-
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/config/ia64-linux-gnu b/config/ia64-linux-gnu
index b4f3c49..60b67aa 100644
--- a/config/ia64-linux-gnu
+++ b/config/ia64-linux-gnu
@@ -21,14 +21,7 @@ fi
 
 case $CC_BASENAME in
     ecc|icc)
-	# Default to C99 standard.
-	CFLAGS="${CFLAGS:--std=c99}"
-	DEBUG_CFLAGS="-w2 -Wall -g -O0"
-	DEBUG_CPPFLAGS=
-	PROD_CFLAGS=""		# ecc has -O2 as default
-	PROD_CPPFLAGS=
-	PROFILE_CFLAGS="-p"
-	PROFILE_CPPFLAGS=
+	. $srcdir/config/intel-flags
 	;;
 
     gcc)
@@ -108,9 +101,9 @@ fi
 
 # A patch to make g++ getting the default settings.
 # CXX_BASENAME should have been set in configure.
-if test $CXX = g++; then
+if test "X$CXX" = "Xg++"; then
     CXX_BASENAME=g++
-if
+fi
 
 
 case $CXX_BASENAME in
diff --git a/config/intel-flags b/config/intel-flags
index b67bcd2..1588189 100644
--- a/config/intel-flags
+++ b/config/intel-flags
@@ -12,7 +12,7 @@
 #   cc_version:   Version number: 8.0
 #
 if test X = "X$cc_flags_set"; then
-    cc_version="`$CC $CFLAGS -V 2>&1 |grep '^Intel'`"
+    cc_version="`$CC $CFLAGS -V 2>&1 |grep 'Version'`"
     if test X != "X$cc_version"; then
         cc_vendor=icc
         cc_version=`echo $cc_version |sed 's/.*Version \([-a-z0-9\.\-]*\).*/\1/'`
-- 
cgit v0.12