diff options
| author | Scot Breitenfeld <brtnfld@hdfgroup.org> | 2015-01-27 21:35:30 (GMT) |
|---|---|---|
| committer | Scot Breitenfeld <brtnfld@hdfgroup.org> | 2015-01-27 21:35:30 (GMT) |
| commit | f142970ac2f2908408f2452eb067b6f3abc0d65a (patch) | |
| tree | f723914aa404fad25ab04f9c88de21c03863c8b3 | |
| parent | 06587c6e91e234229d2c00274aae9312df282d3f (diff) | |
| download | hdf5-f142970ac2f2908408f2452eb067b6f3abc0d65a.zip hdf5-f142970ac2f2908408f2452eb067b6f3abc0d65a.tar.gz hdf5-f142970ac2f2908408f2452eb067b6f3abc0d65a.tar.bz2 | |
[svn-r26059] Fix for: HDFFV-9095
4159:: 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.
Fix:
This check should be located where HL is check for, and it is. Updated the comment to elimenate confusion.
| -rwxr-xr-x | configure | 12 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | m4/aclocal_fc.m4 | 2 |
3 files changed, 8 insertions, 8 deletions
@@ -27967,12 +27967,12 @@ ac_compiler_gnu=$ac_cv_fc_compiler_gnu { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a simple MPI-IO Fortran program can be linked" >&5 $as_echo_n "checking whether a simple MPI-IO Fortran program can be linked... " >&6; } cat > conftest.$ac_ext <<_ACEOF - - program main - include 'mpif.h' - integer:: ierr +make + PROGRAM main + USE mpi + INTEGER :: ierr call mpi_file_open( ierr ) - end + END _ACEOF if ac_fn_fc_try_link "$LINENO"; then : { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 @@ -30301,7 +30301,7 @@ 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 +## If Fortran's default real is double precision 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 diff --git a/configure.ac b/configure.ac index 088ced8..ce82c0f 100644 --- a/configure.ac +++ b/configure.ac @@ -3786,7 +3786,7 @@ if test "X$HDF5_HL" = "Xyes"; then 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 +## If Fortran's default real is double precision 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.]) diff --git a/m4/aclocal_fc.m4 b/m4/aclocal_fc.m4 index 04bcf5f..a8d839a 100644 --- a/m4/aclocal_fc.m4 +++ b/m4/aclocal_fc.m4 @@ -262,7 +262,7 @@ dnl Change to the Fortran 90 language dnl Try link a simple MPI program. AC_MSG_CHECKING([whether a simple MPI-IO Fortran program can be linked]) - AC_LINK_IFELSE([ + AC_LINK_IFELSE([make PROGRAM main USE mpi INTEGER :: ierr |