summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2004-12-03 18:08:14 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2004-12-03 18:08:14 (GMT)
commit90d937946ff1483f8267320d18b7ee2eab28eb82 (patch)
treeccedf1babf20600a7fdf53037dd066b6ec1575b7
parent699588cf3338bb1cc410a360862f7309ad02ea3c (diff)
downloadhdf5-90d937946ff1483f8267320d18b7ee2eab28eb82.zip
hdf5-90d937946ff1483f8267320d18b7ee2eab28eb82.tar.gz
hdf5-90d937946ff1483f8267320d18b7ee2eab28eb82.tar.bz2
[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
-rw-r--r--config/ia64-linux-gnu13
-rw-r--r--config/intel-flags2
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/'`