From 7046addd0b4099531dd7ea9eb756899a826e394d Mon Sep 17 00:00:00 2001
From: Scot Breitenfeld <brtnfld@hdfgroup.org>
Date: Tue, 27 Jan 2015 16:52:53 -0500
Subject: [svn-r26060] Fix for HDFFV-9091 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)
---
 configure        | 12 +-----------
 configure.ac     | 11 -----------
 m4/aclocal_fc.m4 |  4 ++++
 3 files changed, 5 insertions(+), 22 deletions(-)

diff --git a/configure b/configure
index 75e320a..eedab02 100755
--- a/configure
+++ b/configure
@@ -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
@@ -5289,12 +5284,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
 
diff --git a/configure.ac b/configure.ac
index ce82c0f..0e95920 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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
@@ -419,12 +414,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.
   ##
   AC_SUBST([R_LARGE])
diff --git a/m4/aclocal_fc.m4 b/m4/aclocal_fc.m4
index a8d839a..435aad5 100644
--- a/m4/aclocal_fc.m4
+++ b/m4/aclocal_fc.m4
@@ -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
-- 
cgit v0.12