[svn-r21248] Mereged the F2003 branch into the trunk.

Items merged: fortran directory, 
              src/libhdf5.settings.in 
              configure.in configure 
              MANIFEST

Tested: (all platforms used by daily tests, both with --enable-fortran and --enable-fortran2003)

1 files changed, 137 insertions, 5 deletions

diff --git a/configure b/configure
index 5d8c30a..b967830 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Id: configure.in 21185 2011-08-07 14:17:33Z hdftest .
+# From configure.in Id: configure.in 21225 2011-08-14 16:50:04Z hdftest .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.68 for HDF5 1.9.89.
 #
@@ -713,6 +713,8 @@ ac_ct_CXX
 CXXFLAGS
 FORTRAN_DEFAULT_REALisDBLE_F_FALSE
 FORTRAN_DEFAULT_REALisDBLE_F_TRUE
+FORTRAN_2003_CONDITIONAL_F_FALSE
+FORTRAN_2003_CONDITIONAL_F_TRUE
 FORTRAN_HAVE_SIZEOF_FALSE
 FORTRAN_HAVE_SIZEOF_TRUE
 FCLIBS
@@ -731,6 +733,7 @@ HSIZE_T
 HADDR_T
 R_INTEGER
 R_LARGE
+HAVE_FORTRAN_2003
 HDF5_INTERFACES
 am__fastdepCC_FALSE
 am__fastdepCC_TRUE
@@ -761,7 +764,9 @@ GPFS
 HDF5_HL
 CXX
 HDF_CXX
+FC2003
 FC
+HDF_FORTRAN2003
 HDF_FORTRAN
 STATIC_EXEC
 MPE
@@ -859,6 +864,7 @@ enable_maintainer_mode
 enable_dependency_tracking
 enable_unsupported
 enable_fortran
+enable_fortran2003
 enable_cxx
 enable_shared
 enable_static
@@ -1542,7 +1548,8 @@ Optional Features:
   --disable-dependency-tracking  speeds up one-time build
   --enable-dependency-tracking   do not reject slow dependency extractors
   --enable-unsupported    Allow unsupported combinations of configure options
-  --enable-fortran        Compile the Fortran interface [default=no]
+  --enable-fortran        Compile the Fortran 77/90/95 interface [default=no]
+  --enable-fortran2003    Compile the Fortran 2003 interface [default=no]
   --enable-cxx            Compile the C++ interface [default=no]
   --enable-shared[=PKGS]  build shared libraries [default=yes]
   --enable-static[=PKGS]  build static libraries [default=yes]
@@ -3835,7 +3842,9 @@ $as_echo "done" >&6; }
  MPE=no
  STATIC_EXEC=no
  HDF_FORTRAN=no
+ HDF_FORTRAN2003=no
  HDF_FORTRAN=no
+ HDF_FORTRAN2003=no
  HDF_CXX=no
  HDF_CXX=no
  HDF5_HL=yes
@@ -4984,15 +4993,30 @@ if test "${enable_fortran+set}" = set; then :
 fi
 
 
+# Check whether --enable-fortran2003 was given.
+if test "${enable_fortran2003+set}" = set; then :
+  enableval=$enable_fortran2003; HDF_FORTRAN2003=$enableval
+fi
+
 
 HAVE_SIZEOF="no"
 FORTRAN_DEFAULT_REALisDBLE="no"
 
+
+if test "X$HDF_FORTRAN2003" = "Xyes"; then
+  HDF_FORTRAN=yes
+fi
+
+
+
 if test "X$HDF_FORTRAN" = "Xyes"; then
   echo "yes"
 
   HDF5_INTERFACES="$HDF5_INTERFACES fortran"
 
+        HAVE_FORTRAN_2003="no"
+  HAVE_ISO_C_BINDING="no"
+
 
 
 
@@ -6248,8 +6272,6 @@ fi
 
 
 
-
-
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking if Fortran default REAL is DOUBLE PRECISION" >&5
 $as_echo_n "checking if Fortran default REAL is DOUBLE PRECISION... " >&6; }
 
@@ -6295,6 +6317,104 @@ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
   conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
+
+  if test "X$HDF_FORTRAN2003" = "Xyes"; then
+
+
+      	{ $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
+
+      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"
+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
+
+	if test "X$HAVE_ISO_C_BINDING" = "Xyes"; then
+
+                { $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"
+
+                	  	if (${FC} -V 2>&1 | grep 'Sun Fortran') > /dev/null; then
+	            vers=`${FC} -V 2>&1 | sed -rn '\|Fortran 95 | s|.* ([0-9.]+) .*|\1|p' | sed -e 's/[^0-9]//g'`
+                    if test -n "$vers" && test "$vers" -ge 86; then
+	  	      HAVE_FORTRAN_2003="yes"
+	  	      echo $HAVE_FORTRAN_2003
+                    else
+	  	      echo $HAVE_FORTRAN_2003
+	  	      { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Only Sun Fortran Compiler, Version >= 8.6 supported; disabling Fortran 2003 features" >&5
+$as_echo "$as_me: WARNING: Only Sun Fortran Compiler, Version >= 8.6 supported; disabling Fortran 2003 features" >&2;}
+	  	  fi
+	  	fi
+
+                		if (${FC} -V 2>&1 | grep '^Intel(R) Fortran') > /dev/null; then
+	          vers=`${FC} -v 2>&1 | sed -e 's/[^0-9]//g'`
+                  if test -n "$vers" && test "$vers" -ge 101; then
+		     HAVE_FORTRAN_2003="yes"
+		     echo $HAVE_FORTRAN_2003
+                  else
+		    echo $HAVE_FORTRAN_2003
+		    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Only Intel Fortran Compiler, Version > 10.1 supported; disabling Fortran 2003 features" >&5
+$as_echo "$as_me: WARNING: Only Intel Fortran Compiler, Version > 10.1 supported; disabling Fortran 2003 features" >&2;}
+		  fi
+                fi
+
+                		if (${FC} -dumpversion 2>&1 | grep 'G95') > /dev/null; then
+	          vers=`${FC} -dumpversion 2>&1 | grep -o '[^ ]*!' | sed -e 's/[^0-9]//g'`
+                  if test -n "$vers" && test "$vers" -ge 90; then
+		     HAVE_FORTRAN_2003="yes"
+		     echo $HAVE_FORTRAN_2003
+                  else
+		    echo $HAVE_FORTRAN_2003
+		    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Only G95 Fortran Compiler, Version > .9 supported; disabling Fortran 2003 features" >&5
+$as_echo "$as_me: WARNING: Only G95 Fortran Compiler, Version > .9 supported; disabling Fortran 2003 features" >&2;}
+		  fi
+		fi
+
+                                if (${FC} --version 2>&1 | grep 'GNU Fortran') > /dev/null; then
+                  vers_major=`${FC} --version 2>&1 | grep 'GNU Fortran (' | grep -o ' [0-9]*\.' | sed -e 's/[^0-9]//g'`
+                  vers_minor=`${FC} --version 2>&1 | grep 'GNU Fortran (' | grep -o '\.[0-9]*\.' | sed -e 's/[^0-9]//g'`
+
+                  if test -n "$vers_major" && test -n "$vers_minor" && test "$vers_major" -ge 4 && test "$vers_minor" -ge 1; then
+		     HAVE_FORTRAN_2003="yes"
+		     echo $HAVE_FORTRAN_2003
+                  else
+		    echo $HAVE_FORTRAN_2003
+		    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Only GNU Fortran Compiler, Version > 4.1.0 supported; disabling Fortran 2003 features" >&5
+$as_echo "$as_me: WARNING: Only GNU Fortran Compiler, Version > 4.1.0 supported; disabling Fortran 2003 features" >&2;}
+		  fi
+		fi
+
+                              if (${FC} -V 2>&1 | grep 'Portland Group') > /dev/null; then
+                  vers=`${FC} -V 2>&1 | grep 'pgf' | grep -o '[^ ]*[^  ]\.[^ ]' | sed -e 's/[^0-9]//g'`
+                  if test -n "$vers" && test "$vers" -ge 104; then
+		     HAVE_FORTRAN_2003="yes"
+		     echo $HAVE_FORTRAN_2003
+                  else
+		    echo $HAVE_FORTRAN_2003
+		    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Only The Portland Group Compiler, Version > 10.4-0 supported; disabling Fortran 2003 features" >&5
+$as_echo "$as_me: WARNING: Only The Portland Group Compiler, Version > 10.4-0 supported; disabling Fortran 2003 features" >&2;}
+		  fi
+
+               fi
+
+
+        fi
+
+  fi
+
     ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -6314,6 +6434,14 @@ else
   FORTRAN_HAVE_SIZEOF_FALSE=
 fi
 
+ if test "X$HAVE_FORTRAN_2003" = "Xyes"; then
+  FORTRAN_2003_CONDITIONAL_F_TRUE=
+  FORTRAN_2003_CONDITIONAL_F_FALSE='#'
+else
+  FORTRAN_2003_CONDITIONAL_F_TRUE='#'
+  FORTRAN_2003_CONDITIONAL_F_FALSE=
+fi
+
  if test "X$FORTRAN_DEFAULT_REALisDBLE" = "Xyes"; then
   FORTRAN_DEFAULT_REALisDBLE_F_TRUE=
   FORTRAN_DEFAULT_REALisDBLE_F_FALSE='#'
@@ -7366,7 +7494,7 @@ $as_echo "none" >&6; }
             ;;
 esac
 
-if test "X$HDF_FORTRAN" = "Xyes"; then
+if test "X$HDF_FORTRAN" = "Xyes" ; then
     ac_ext=${ac_fc_srcext-f}
 ac_compile='$FC -c $FCFLAGS $ac_fcflags_srcext conftest.$ac_ext >&5'
 ac_link='$FC -o conftest$ac_exeext $FCFLAGS $LDFLAGS $ac_fcflags_srcext conftest.$ac_ext $LIBS >&5'
@@ -29985,6 +30113,10 @@ if test -z "${FORTRAN_HAVE_SIZEOF_TRUE}" && test -z "${FORTRAN_HAVE_SIZEOF_FALSE
   as_fn_error $? "conditional \"FORTRAN_HAVE_SIZEOF\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${FORTRAN_2003_CONDITIONAL_F_TRUE}" && test -z "${FORTRAN_2003_CONDITIONAL_F_FALSE}"; then
+  as_fn_error $? "conditional \"FORTRAN_2003_CONDITIONAL_F\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 if test -z "${FORTRAN_DEFAULT_REALisDBLE_F_TRUE}" && test -z "${FORTRAN_DEFAULT_REALisDBLE_F_FALSE}"; then
   as_fn_error $? "conditional \"FORTRAN_DEFAULT_REALisDBLE_F\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5