diff options
| author | Scot Breitenfeld <brtnfld@hdfgroup.org> | 2013-04-01 02:16:00 (GMT) |
|---|---|---|
| committer | Scot Breitenfeld <brtnfld@hdfgroup.org> | 2013-04-01 02:16:00 (GMT) |
| commit | 91bcf7432e992d58741fe1925bb93bf32feb3358 (patch) | |
| tree | f279fcd4a483dc25229eeabae8045fc4d6ae52ed | |
| parent | a46ee1a136ca7f62879a536cf3905b8fe0c768f2 (diff) | |
| download | hdf5-91bcf7432e992d58741fe1925bb93bf32feb3358.zip hdf5-91bcf7432e992d58741fe1925bb93bf32feb3358.tar.gz hdf5-91bcf7432e992d58741fe1925bb93bf32feb3358.tar.bz2 | |
[svn-r23506] reverted changes in FFLAGS setting.
Tested: jam (gnu)
| -rwxr-xr-x | configure | 10 | ||||
| -rw-r--r-- | configure.ac | 8 |
2 files changed, 11 insertions, 7 deletions
@@ -1,5 +1,5 @@ #! /bin/sh -# From configure.ac Id: configure.ac 23440 2013-03-24 21:34:35Z hdftest . +# From configure.ac Id: configure.ac 23504 2013-03-31 21:36:11Z hdftest . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.69 for HDF5 1.8.11-snap16. # @@ -5246,9 +5246,11 @@ if test "X$HDF_FORTRAN" = "Xyes"; then ## -------------------------------------------------------------------- ## General Fortran flags - ## - AM_FCFLAGS="${AM_FCFLAGS} ${FFLAGS}" - FCFLAGS="${FCFLAGS} ${FFLAGS}" + ## Only add FFLAGS to FCFLAGS if it's set. + if test "x$FFLAGS" != "x" ; then + AM_FCFLAGS="${AM_FCFLAGS} ${FFLAGS}" + FCFLAGS="${FCFLAGS} ${FFLAGS}" + fi ## -------------------------------------------------------------------- ## Fortran source extention diff --git a/configure.ac b/configure.ac index 1768a71..60d2501 100644 --- a/configure.ac +++ b/configure.ac @@ -434,9 +434,11 @@ if test "X$HDF_FORTRAN" = "Xyes"; then ## -------------------------------------------------------------------- ## General Fortran flags - ## - AM_FCFLAGS="${AM_FCFLAGS} ${FFLAGS}" - FCFLAGS="${FCFLAGS} ${FFLAGS}" + ## Only add FFLAGS to FCFLAGS if it's set. + if test "x$FFLAGS" != "x" ; then + AM_FCFLAGS="${AM_FCFLAGS} ${FFLAGS}" + FCFLAGS="${FCFLAGS} ${FFLAGS}" + fi ## -------------------------------------------------------------------- ## Fortran source extention |