From 6e0edba918dcbdd62414791d0e2b2f57bc97b8b5 Mon Sep 17 00:00:00 2001
From: Scot Breitenfeld <brtnfld@hdfgroup.org>
Date: Tue, 18 Aug 2015 17:11:37 -0500
Subject: [svn-r27521] Added test to not remove double precision from valid
 KINDS if it is the largest compatible REAL with C.

Tested: h5committest.
---
 configure    | 18 ++++++++++--------
 configure.ac | 15 ++++++++++-----
 2 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/configure b/configure
index c050cf3..42e9b81 100755
--- a/configure
+++ b/configure
@@ -8393,15 +8393,17 @@ _ACEOF
   max_real_fortran_kind="`echo \"$PAC_FC_ALL_REAL_KINDS\" | sed -ne 's/.*,\([0-9]*\)\}/\1/p'`"
 
     if test "$ac_cv_sizeof___float128" != 0;then
-    if test "$ac_cv_sizeof___float128" != "$max_real_fortran_sizeof" && test "${ac_cv_sizeof_long_double}" != "$max_real_fortran_sizeof"; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING:
-        Fortran REAL(KIND=$max_real_fortran_kind) is $max_real_fortran_sizeof Bytes, but no corresponding C float type exists of that size
-                  !!! Fortran interfaces will not be generated for REAL(KIND=$max_real_fortran_kind) !!!
-      " >&5
+    if test "$ac_cv_sizeof___float128" != "$max_real_fortran_sizeof" &&
+       test "${ac_cv_sizeof_long_double}" != "$max_real_fortran_sizeof" &&
+                            test "${ac_cv_sizeof_double}" != "$max_real_fortran_sizeof" ; then
+          { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING:
+           Fortran REAL(KIND=$max_real_fortran_kind) is $max_real_fortran_sizeof Bytes, but no corresponding C float type exists of that size
+                     !!! Fortran interfaces will not be generated for REAL(KIND=$max_real_fortran_kind) !!!
+          " >&5
 $as_echo "$as_me: WARNING:
-        Fortran REAL(KIND=$max_real_fortran_kind) is $max_real_fortran_sizeof Bytes, but no corresponding C float type exists of that size
-                  !!! Fortran interfaces will not be generated for REAL(KIND=$max_real_fortran_kind) !!!
-      " >&2;}
+           Fortran REAL(KIND=$max_real_fortran_kind) is $max_real_fortran_sizeof Bytes, but no corresponding C float type exists of that size
+                     !!! Fortran interfaces will not be generated for REAL(KIND=$max_real_fortran_kind) !!!
+          " >&2;}
       PAC_FC_ALL_REAL_KINDS="`echo $PAC_FC_ALL_REAL_KINDS | sed -e 's/,[0-9]\+}/}/g'`"
       PAC_FC_ALL_REAL_KINDS_SIZEOF="`echo $PAC_FC_ALL_REAL_KINDS_SIZEOF | sed -e 's/,[0-9]\+}/}/g'`"
     fi
diff --git a/configure.ac b/configure.ac
index 9ca4440..88d037c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -571,11 +571,16 @@ if test "X$HDF_FORTRAN" = "Xyes"; then
 
   dnl remove the invalid kind from the list
   if test "$ac_cv_sizeof___float128" != 0;then
-    if test "$ac_cv_sizeof___float128" != "$max_real_fortran_sizeof" && test "${ac_cv_sizeof_long_double}" != "$max_real_fortran_sizeof"; then
-      AC_MSG_WARN([
-        Fortran REAL(KIND=$max_real_fortran_kind) is $max_real_fortran_sizeof Bytes, but no corresponding C float type exists of that size
-                  !!! Fortran interfaces will not be generated for REAL(KIND=$max_real_fortran_kind) !!!
-      ])
+    if test "$ac_cv_sizeof___float128" != "$max_real_fortran_sizeof" && 
+       test "${ac_cv_sizeof_long_double}" != "$max_real_fortran_sizeof" &&
+       dnl account for the fact that the C compiler can have 16-byte __float128 and the Fortran compiler only has 8-byte doubles,
+       dnl so we don't want to remove the 8-byte Fortran doubles. This is sometimes the case if different C and Fortran vendors
+       dnl are used (for example gnu and pgi).
+       test "${ac_cv_sizeof_double}" != "$max_real_fortran_sizeof" ; then
+          AC_MSG_WARN([
+           Fortran REAL(KIND=$max_real_fortran_kind) is $max_real_fortran_sizeof Bytes, but no corresponding C float type exists of that size
+                     !!! Fortran interfaces will not be generated for REAL(KIND=$max_real_fortran_kind) !!!
+          ])
       PAC_FC_ALL_REAL_KINDS="`echo $PAC_FC_ALL_REAL_KINDS | sed -e 's/,[[0-9]]\+}/}/g'`"
       PAC_FC_ALL_REAL_KINDS_SIZEOF="`echo $PAC_FC_ALL_REAL_KINDS_SIZEOF | sed -e 's/,[[0-9]]\+}/}/g'`"
     fi
-- 
cgit v0.12