summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2004-10-09 02:38:50 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2004-10-09 02:38:50 (GMT)
commitbf4f24a4974915f29a93f6b7200c43b968ec36e2 (patch)
tree0174566c18edad83c7c7f8623003377b12698620
parenta25cc355a30082e1a9ae7e913080b302d2b4814b (diff)
downloadhdf5-bf4f24a4974915f29a93f6b7200c43b968ec36e2.zip
hdf5-bf4f24a4974915f29a93f6b7200c43b968ec36e2.tar.gz
hdf5-bf4f24a4974915f29a93f6b7200c43b968ec36e2.tar.bz2
[svn-r9384] Purpose:
Refactor and update fortran configuration Description: Changed configure.in to include the production, debugging and profiling flags for FORTRAN in the command line. Added '-flags' files for PGI and Intel C compilers Added '-fflags' files for PGI and Intel FORTRAN compilers Updated 'gnu-flags' file for GNU C compiler to not modify compiler flags when gcc is not being used. Make detection of the correct FORTRAN compiler a bit smarter for Linux platforms. (And carried over some of the minor changes to other affected machines) Platforms tested: Linux 2.4 (tungsten) w/PGI and Intel C & FORTRAN compilers. Changes not tested by h5committest
-rw-r--r--MANIFEST4
-rw-r--r--configure.in19
2 files changed, 20 insertions, 3 deletions
diff --git a/MANIFEST b/MANIFEST
index d7f762c..081756f 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -60,6 +60,8 @@
./config/hpux9.03
./config/i386-pc-cygwin32
./config/ia64-linux-gnu
+./config/intel-fflags
+./config/intel-flags
./config/intel-osf1
./config/irix5.x
./config/irix6.x
@@ -67,6 +69,8 @@
./config/linux-gnuaout
./config/linux-gnulibc1
./config/linux-gnulibc2
+./config/pgi-fflags
+./config/pgi-flags
./config/powerpc-apple
./config/powerpc-ibm-aix4.x
./config/powerpc-ibm-aix5.x
diff --git a/configure.in b/configure.in
index 854fda9..069ec54 100644
--- a/configure.in
+++ b/configure.in
@@ -623,26 +623,39 @@ case "X-$enable_production" in
CXXFLAGS=$CXXFLAGS_temp
fi
+ FFLAGS_temp=""
+ if test -n "$FFLAGS"; then
+ for d in $FFLAGS ; do
+ if test "X$d" != "X-g"; then
+ FFLAGS_temp="$FFLAGS_temp $d"
+ fi
+ done
+ FFLAGS=$FFLAGS_temp
+ fi
+
CONFIG_MODE=production
CFLAGS="$CFLAGS $PROD_CFLAGS"
- CXXFLAGS="$CXXFLAGS $PROD_CXXFLAGS"
CPPFLAGS="$CPPFLAGS $PROD_CPPFLAGS"
+ CXXFLAGS="$CXXFLAGS $PROD_CXXFLAGS"
+ FFLAGS="$FFLAGS $PROD_FFLAGS"
;;
X-|X-no)
enable_production="no"
AC_MSG_RESULT([development])
CONFIG_MODE=development
CFLAGS="$CFLAGS $DEBUG_CFLAGS"
- CXXFLAGS="$CXXFLAGS $DEBUG_CXXFLAGS"
CPPFLAGS="$CPPFLAGS $DEBUG_CPPFLAGS"
+ CXXFLAGS="$CXXFLAGS $DEBUG_CXXFLAGS"
+ FFLAGS="$FFLAGS $DEBUG_FFLAGS"
;;
X-pg|X-profile)
enable_production="profile"
AC_MSG_RESULT([profile])
CONFIG_MODE=profile
CFLAGS="$CFLAGS $PROFILE_CFLAGS"
- CXXFLAGS="$CXXFLAGS $PROFILE_CXXFLAGS"
CPPFLAGS="$CPPFLAGS $PROFILE_CPPFLAGS"
+ CXXFLAGS="$CXXFLAGS $PROFILE_CXXFLAGS"
+ FFLAGS="$FFLAGS $PROFILE_FFLAGS"
;;
*)
enable_production="user-defined"