mirror/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2024-11-21 01:04:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

[svn-r26060] Fix for HDFFV-9091

Browse Source 
405-408::fortran vars should be scoped

Scoped:

HAVE_SIZEOF
HAVE_C_SIZEOF
HAVE_STORAGE_SIZE
FORTRAN_DEFAULT_REALisDBLE

to where the tests are (in m4/aclocal_fc.m4)

Tested: jam (gnu)
This commit is contained in:
Scot Breitenfeld 2015-01-27 16:52:53 -05:00
parent f142970ac2
commit 7046addd0b
3 changed files with 5 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
configure vendored
View File

@ -5276,11 +5276,6 @@ else
fi
fi
HAVE_SIZEOF="no"
HAVE_C_SIZEOF="no"
HAVE_STORAGE_SIZE="no"
FORTRAN_DEFAULT_REALisDBLE="no"
if test "X$HDF_FORTRAN" = "Xyes"; then
HDF_FORTRAN=yes
@ -5288,12 +5283,6 @@ if test "X$HDF_FORTRAN" = "Xyes"; then
HDF5_INTERFACES="$HDF5_INTERFACES fortran"
## --------------------------------------------------------------------
## Default for FORTRAN 2003 compliant compilers
##
HAVE_FORTRAN_2003="no"
HAVE_F2003_REQUIREMENTS="no"
## --------------------------------------------------------------------
## HDF5 integer variables for the H5fortran_types.f90 file.
##
@ -6706,6 +6695,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if Fortran compiler version compatible with Fortran 2003 HDF" >&5
$as_echo_n "checking if Fortran compiler version compatible with Fortran 2003 HDF... " >&6; }
HAVE_FORTRAN_2003="no"
HAVE_F2003_REQUIREMENTS="no"
cat > conftest.$ac_ext <<_ACEOF
program main

11
configure.ac
View File

@ -406,11 +406,6 @@ else
fi
fi
HAVE_SIZEOF="no"
HAVE_C_SIZEOF="no"
HAVE_STORAGE_SIZE="no"
FORTRAN_DEFAULT_REALisDBLE="no"
if test "X$HDF_FORTRAN" = "Xyes"; then
AC_SUBST([FC]) HDF_FORTRAN=yes
@ -418,12 +413,6 @@ if test "X$HDF_FORTRAN" = "Xyes"; then
HDF5_INTERFACES="$HDF5_INTERFACES fortran"
## --------------------------------------------------------------------
## Default for FORTRAN 2003 compliant compilers
##
HAVE_FORTRAN_2003="no"
HAVE_F2003_REQUIREMENTS="no"
## --------------------------------------------------------------------
## HDF5 integer variables for the H5fortran_types.f90 file.
##

4
m4/aclocal_fc.m4
View File

@ -149,7 +149,11 @@ dnl disable Fortran 2003 if it does not.
AC_DEFUN([PAC_PROG_FC_HAVE_F2003_REQUIREMENTS],[
AC_MSG_CHECKING([if Fortran compiler version compatible with Fortran 2003 HDF])
dnl --------------------------------------------------------------------
dnl Default for FORTRAN 2003 compliant compilers
dnl
HAVE_FORTRAN_2003="no"
HAVE_F2003_REQUIREMENTS="no"
AC_LINK_IFELSE([AC_LANG_PROGRAM([],[
USE iso_c_binding