summaryrefslogtreecommitdiffstats
path: root/config/intel-fflags
diff options
context:
space:
mode:
authorJames Laird <jlaird@hdfgroup.org>2005-03-07 17:57:27 (GMT)
committerJames Laird <jlaird@hdfgroup.org>2005-03-07 17:57:27 (GMT)
commit25df1908bc0430994cecc9f1415838f42fe0c816 (patch)
treebce2777e087cc7d547e7b644f908eff72282bb53 /config/intel-fflags
parent630b2901c53c66c837e39babe9da0c20020e5d4d (diff)
downloadhdf5-25df1908bc0430994cecc9f1415838f42fe0c816.zip
hdf5-25df1908bc0430994cecc9f1415838f42fe0c816.tar.gz
hdf5-25df1908bc0430994cecc9f1415838f42fe0c816.tar.bz2
[svn-r10158] Purpose:
Automake version upgrade Description: Upgraded automake version from 1.6.2 to 1.9.5. Changed bin/reconfigure script to use automake 1.9.5. Changed configure.in and Makefiles to use new FCFLAGS and FC variables instead of FFLAGS and F9X. Automake and configure should now do the lion's share of the work supporting Fortran 9X; macros in acsite.m4 are now mostly unused (will be cleaned later). Altered how configure handles pmake; now root-level Makefile.in is processed by bin/reconfigure to have a .MAKEFLAGS target, since automake no longer allows us to define unused variables. Configure now always checks for C++ compiler even if it is not used, since automake thinks this is the Right Thing To Do and will break otherwise. Platforms tested: Sol, copper, heping, mir, sleipnir, eirene, pommier, kelgia, modi4.
Diffstat (limited to 'config/intel-fflags')
-rw-r--r--config/intel-fflags14
1 files changed, 7 insertions, 7 deletions
diff --git a/config/intel-fflags b/config/intel-fflags
index 0a65f0e..51ba6d0 100644
--- a/config/intel-fflags
+++ b/config/intel-fflags
@@ -12,11 +12,11 @@
# f9x_version: Version number: 8.0
#
if test X = "X$f9x_flags_set"; then
- f9x_version="`$F9X $FFLAGS -V 2>&1 |grep '^Intel'`"
+ f9x_version="`$FC $FCFLAGS -V 2>&1 |grep '^Intel'`"
if test X != "X$f9x_version"; then
f9x_vendor=ifort
f9x_version="`echo $f9x_version |sed 's/.*Version \([-a-z0-9\.\-]*\).*/\1/'`"
- echo "compiler '$F9X' is Intel $f9x_vendor-$f9x_version"
+ echo "compiler '$FC' is Intel $f9x_vendor-$f9x_version"
# Some version numbers
# Intel version numbers are of the form: "major.minor"
@@ -53,20 +53,20 @@ if test "X-ifort" = "X-$f9x_vendor"; then
#esac
# General
- F9X_BASENAME=ifort
+ FC_BASENAME=ifort
F9XSUFFIXFLAG=""
FSEARCH_DIRS=""
- FFLAGS="$FFLAGS"
+ FCFLAGS="$FCFLAGS"
# Production
- PROD_FFLAGS="-O3"
+ PROD_FCFLAGS="-O3"
# Debug
- DEBUG_FFLAGS="-g -check all"
+ DEBUG_FCFLAGS="-g -check all"
# Profile
# Use this for profiling with gprof
- PROFILE_FFLAGS="-g -p"
+ PROFILE_FCFLAGS="-g -p"
# Flags are set
f9x_flags_set=yes