From c9874681a6b5056598a5170faecad9b29640fbba Mon Sep 17 00:00:00 2001
From: Quincey Koziol <koziol@hdfgroup.org>
Date: Sat, 30 Oct 2004 23:59:57 -0500
Subject: [svn-r9491] Purpose:     Bug fix

Description:
    "Teach" the configure scripts about Intel 7.1 compilers, which don't have
_quite_ the same compiler flags

Platforms tested:
    Linux 2.4 (eirene)
---
 config/intel-fflags   |  2 +-
 config/intel-flags    |  2 +-
 config/linux-gnulibc1 | 34 +++++++++++++++++++++-------------
 3 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/config/intel-fflags b/config/intel-fflags
index 29398d0..0a65f0e 100644
--- a/config/intel-fflags
+++ b/config/intel-fflags
@@ -15,7 +15,7 @@ if test X = "X$f9x_flags_set"; then
     f9x_version="`$F9X $FFLAGS -V 2>&1 |grep '^Intel'`"
     if test X != "X$f9x_version"; then
         f9x_vendor=ifort
-        f9x_version="`$F9X $FFLAGS -v 2>&1 |sed 's/Version \([-a-z0-9\.\-]*\).*/\1/'`"
+        f9x_version="`echo $f9x_version |sed 's/.*Version \([-a-z0-9\.\-]*\).*/\1/'`"
         echo "compiler '$F9X' is Intel $f9x_vendor-$f9x_version"
 
         # Some version numbers
diff --git a/config/intel-flags b/config/intel-flags
index e67328c..f5e0348 100644
--- a/config/intel-flags
+++ b/config/intel-flags
@@ -15,7 +15,7 @@ if test X = "X$cc_flags_set"; then
     cc_version="`$CC $CFLAGS -V 2>&1 |grep '^Intel'`"
     if test X != "X$cc_version"; then
         cc_vendor=icc
-        cc_version="`$CC $CFLAGS --version 2>&1`"
+        cc_version=`echo $cc_version |sed 's/.*Version \([-a-z0-9\.\-]*\).*/\1/'`
         echo "compiler '$CC' is Intel $cc_vendor-$cc_version"
 
         # Some version numbers
diff --git a/config/linux-gnulibc1 b/config/linux-gnulibc1
index 225184b..0758a4b 100644
--- a/config/linux-gnulibc1
+++ b/config/linux-gnulibc1
@@ -38,19 +38,27 @@ if test "X-" = "X-$F9X"; then
             ;;
     esac
 else
-    # Figure out which compiler we are using: pgf90 or Absoft f95
-    RM='rm -f'
-    tmpfile=/tmp/cmpver.$$
-    $F9X -V >$tmpfile
-    if test -s "$tmpfile"; then 
-        if( grep -s 'Absoft' $tmpfile > /dev/null) then
-            F9X_BASENAME=f95
-        fi 
-        if( grep -s 'pgf90' $tmpfile > /dev/null) then
-            F9X_BASENAME=pgf90
-        fi 
-    fi
-    $RM $tmpfile
+    case $F9X in
+        # The PGI and Intel compilers are automatically detected below
+        ifc*|ifort*|pgf90*)
+            ;;
+
+        *)
+            # Figure out which compiler we are using: pgf90 or Absoft f95
+            RM='rm -f'
+            tmpfile=/tmp/cmpver.$$
+            $F9X -V >$tmpfile
+            if test -s "$tmpfile"; then 
+                if( grep -s 'Absoft' $tmpfile > /dev/null) then
+                    F9X_BASENAME=f95
+                fi 
+                if( grep -s 'pgf90' $tmpfile > /dev/null) then
+                    F9X_BASENAME=pgf90
+                fi 
+            fi
+            $RM $tmpfile
+            ;;
+    esac
 fi
 
 #
-- 
cgit v0.12