[svn-r25477] Added error if Fortran's default real is double precision. If it is and HL is being built then configure returns an error. This is due to HDFFV-889.

Tested: jam with intel and -r8 flag, both with and without --disable-hl.
This commit is contained in:
Scot Breitenfeld 2014-07-24 10:55:16 -05:00
parent c85497442b
commit f793c50e47
2 changed files with 18 additions and 0 deletions

9
configure vendored
View File

@ -6906,6 +6906,8 @@ else
fi
## ----------------------------------------------------------------------
## Check if they would like the C++ interface compiled
##
@ -30971,10 +30973,17 @@ if test "X$HDF5_HL" = "Xyes"; then
$as_echo "#define INCLUDE_HL 1" >>confdefs.h
## Check if Fortran's default real is double precision. If it is and HL is being built then configure
## should fail due to bug HDFFV-889.
if test "X$FORTRAN_DEFAULT_REALisDBLE" = "Xyes"; then
as_fn_error $? "Fortran high-level routines are not supported when the default REAL is DOUBLE PRECISION, use configure option --disable-hl." "$LINENO" 5
fi
else
echo "no"
fi
## ----------------------------------------------------------------------
## Some programs shouldn't be built by default (e.g., programs to generate
## data files used by tests, some optional tests).

View File

@ -586,6 +586,8 @@ AM_CONDITIONAL([FORTRAN_HAVE_STORAGE_SIZE], [test "X$HAVE_STORAGE_SIZE" = "Xyes"
AM_CONDITIONAL([FORTRAN_2003_CONDITIONAL_F], [test "X$HAVE_FORTRAN_2003" = "Xyes"])
AM_CONDITIONAL([FORTRAN_DEFAULT_REALisDBLE_F], [test "X$FORTRAN_DEFAULT_REALisDBLE" = "Xyes"])
## ----------------------------------------------------------------------
## Check if they would like the C++ interface compiled
##
@ -4153,10 +4155,17 @@ if test "X$HDF5_HL" = "Xyes"; then
HL="hl"
AC_DEFINE([INCLUDE_HL], [1],
[Define if HDF5's high-level library headers should be included in hdf5.h])
## Check if Fortran's default real is double precision. If it is and HL is being built then configure
## should fail due to bug HDFFV-889.
if test "X$FORTRAN_DEFAULT_REALisDBLE" = "Xyes"; then
AC_MSG_ERROR([Fortran high-level routines are not supported when the default REAL is DOUBLE PRECISION, use configure option --disable-hl.])
fi
else
echo "no"
fi
## ----------------------------------------------------------------------
## Some programs shouldn't be built by default (e.g., programs to generate
## data files used by tests, some optional tests).