[svn-r9385] *** empty log message ***

1 files changed, 49 insertions, 45 deletions

diff --git a/config/linux-gnulibc1 b/config/linux-gnulibc1
index 43a48f2..3e974a4 100644
--- a/config/linux-gnulibc1
+++ b/config/linux-gnulibc1
@@ -12,33 +12,42 @@ if test -z "$CC"; then
    CC_BASENAME=gcc
 fi
 
-# Omit frame pointer for optimized code?
-NOFP=${NOFP:=-fomit-frame-pointer}
-
-# Figure out compiler flags
+# Figure out GNU compiler flags
 . $srcdir/config/gnu-flags
 
+# Figure out PGI C compiler flags
+. $srcdir/config/pgi-flags
 
-# Figure out which compiler we are using: pgf90 or Absoft f95
-RM='rm -f'
-tmpfile=/tmp/cmpver.$$
-$F9X -V >$tmpfile
+# Figure out Intel C compiler flags
+. $srcdir/config/intel-flags
 
+# The default Fortran 90 compiler
+if test "X-" = "X-$F9X"; then
+    case $CC_BASENAME in
+        gcc*|pgcc*)
+            F9X=pgf90
+            F9X_BASENAME=pgf90
+            ;;
+        icc*)
+            F9X=ifort
+            F9X_BASENAME=ifort
+            ;;
+    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
-              CFLAGS="$CFLAGS -DH5_ABSOFT" 
-       fi 
-       if( grep -s 'pgf90' $tmpfile > /dev/null)
-          then
-              F9X_BASENAME=pgf90
-       fi 
+        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
-
-# The default Fortran 90 compiler
+    $RM $tmpfile
+fi
 
 #
 # HDF5 integers
@@ -56,38 +65,33 @@ HID_T='SELECTED_INT_KIND(R_INTEGER)'
 SIZE_T='SELECTED_INT_KIND(R_INTEGER)'
 OBJECT_NAMELEN_DEFAULT_F=-1
 
+# Figure out PGI F90 compiler flags
+. $srcdir/config/pgi-fflags
 
-if test "X-" = "X-$F9X"; then
-    F9X=pgf90
-    F9X_BASENAME=pgf90
-fi
+# Figure out Intel F90 compiler flags
+. $srcdir/config/intel-fflags
 
 case $F9X_BASENAME in
-    pgf90) 
-    F9XSUFFIXFLAG=""
-    FFLAGS="$FFLAGS"
-    FSEARCH_DIRS=""
-    DEBUG_FFLAGS=""
-    PROD_FFLAGS=""
-    PROFILE_FFLAGS=""
-    f9x_flags_set=yes
-    ;;
-#
-# Assume Absoft compiler
-#
+    #
+    # Absoft compiler
+    #
     f95)
-    F9XSUFFIXFLAG=""
+        # Set required flag for compiling C stubs
+        CFLAGS="$CFLAGS -DH5_ABSOFT" 
+
+        F9XSUFFIXFLAG=""
 # We force compiler to use upper case for external names 
 # (just in case since this should be a default EIP)
-    FFLAGS="$FFLAGS -YEXT_NAMES=UCS"
-    FSEARCH_DIRS=""
-    DEBUG_FFLAGS="-O"
-    PROD_FFLAGS="-O"
-    PROFILE_FFLAGS="-O"
-    f9x_flags_set=yes
-    ;;
+        FFLAGS="$FFLAGS -YEXT_NAMES=UCS"
+        FSEARCH_DIRS=""
+        DEBUG_FFLAGS="-g"
+        PROD_FFLAGS="-O"
+        PROFILE_FFLAGS="-g -pg"
+        f9x_flags_set=yes
+        ;;
 
 esac  
+
 # The default C++ compiler
 
 # The default compiler is `g++'.