From be904e0eae88d92d8014c879e0464f3dba144316 Mon Sep 17 00:00:00 2001
From: Dana Robinson <derobins@hdfgroup.org>
Date: Tue, 23 Aug 2011 16:18:19 -0500
Subject: [svn-r21303] Removed duplicated INSTALL_SCRIPT_FILES macro from
 fortran/examples and fixed an autotools warning from the Fortran 2003
 configure.in changes.  Tested on jam (minor changes).

---
 configure                    | 9 ++++-----
 configure.in                 | 9 ++++-----
 fortran/examples/Makefile.am | 1 -
 3 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/configure b/configure
index e329014..3d7139c 100755
--- a/configure
+++ b/configure
@@ -6337,20 +6337,19 @@ fi
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking if Fortran compiler supports ISO_C_BINDING module" >&5
 $as_echo_n "checking if Fortran compiler supports ISO_C_BINDING module... " >&6; }
 
+
     cat > conftest.$ac_ext <<_ACEOF
       program main
-
-      	 USE iso_c_binding
-
+USE iso_c_binding
       end
 _ACEOF
 if ac_fn_fc_try_compile "$LINENO"; then :
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-    HAVE_ISO_C_BINDING="yes"
+$as_echo "yes" >&6; } HAVE_ISO_C_BINDING="yes"
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
+
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
diff --git a/configure.in b/configure.in
index 2d632e2..f245818 100644
--- a/configure.in
+++ b/configure.in
@@ -529,11 +529,10 @@ if test "X$HDF_FORTRAN" = "Xyes"; then
 
     AC_MSG_CHECKING([if Fortran compiler supports ISO_C_BINDING module])
 	
-    AC_TRY_COMPILE(,[
-      	 USE iso_c_binding
-    ], [AC_MSG_RESULT(yes)
-    HAVE_ISO_C_BINDING="yes"], 
-    AC_MSG_RESULT(no))
+    AC_COMPILE_IFELSE(AC_LANG_PROGRAM([],[USE iso_c_binding]),
+        [AC_MSG_RESULT(yes) HAVE_ISO_C_BINDING="yes"],
+        AC_MSG_RESULT(no)
+    )
 
     if test "X$HAVE_ISO_C_BINDING" = "Xno"; then
       AC_MSG_ERROR([Fortran compiler does not have ISO_C_BINDING; unsupported Fortran 2003 compiler, remove --enable-fortran2003])
diff --git a/fortran/examples/Makefile.am b/fortran/examples/Makefile.am
index d767490..7465b98 100644
--- a/fortran/examples/Makefile.am
+++ b/fortran/examples/Makefile.am
@@ -42,7 +42,6 @@ INSTALL_FILES=dsetexample.f90 fileexample.f90 rwdsetexample.f90           \
      hyperslab.f90 selectele.f90 grpit.f90 refobjexample.f90              \
      refregexample.f90 mountexample.f90  compound.f90 ph5example.f90
 INSTALL_SCRIPT_FILES = run-fortran-ex.sh
-INSTALL_SCRIPT_FILES = run-fortran-ex.sh
 
 
 # Add attention tests for Fortran 2003 features
-- 
cgit v0.12