summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScot Breitenfeld <brtnfld@hdfgroup.org>2015-06-25 20:06:16 (GMT)
committerScot Breitenfeld <brtnfld@hdfgroup.org>2015-06-25 20:06:16 (GMT)
commit44718454cacbad4a39e06e8935406e17be046ea0 (patch)
treeaef36ddaca5ee971108256c5564a1061a4f9cbaf
parent8353d79d26b6b4ad513e4e4e7c346eda2797f3d6 (diff)
downloadhdf5-44718454cacbad4a39e06e8935406e17be046ea0.zip
hdf5-44718454cacbad4a39e06e8935406e17be046ea0.tar.gz
hdf5-44718454cacbad4a39e06e8935406e17be046ea0.tar.bz2
[svn-r27285] added search replace for space to comma
-rwxr-xr-xconfigure4
-rw-r--r--configure.ac5
-rw-r--r--m4/aclocal_fc.m42
3 files changed, 7 insertions, 4 deletions
diff --git a/configure b/configure
index cc68365..471901e 100755
--- a/configure
+++ b/configure
@@ -7891,8 +7891,8 @@ $as_echo_n "checking for Fortran interoperable KINDS with C... " >&6; }
$as_echo "$PAC_FC_ALL_REAL_KINDS" >&6; }
H5CONFIG_F_NUM_RKIND="INTEGER, PARAMETER :: num_rkinds = `echo \"$PAC_FC_ALL_REAL_KINDS\" | perl -e '$count = (<STDIN> =~ tr/,//);print $count+1'`"
- H5CONFIG_F_RKIND="INTEGER, DIMENSION(1:num_rkinds) :: rkind = (/`echo $PAC_FC_ALL_REAL_KINDS | sed -e 's/{//g' | sed -e 's/}//g'`/)"
- H5CONFIG_F_RKIND_SIZEOF="INTEGER, DIMENSION(1:num_rkinds) :: rkind_sizeof = (/`echo $PAC_FC_ALL_REAL_KINDS_SIZEOF | sed -e 's/{//g' | sed -e 's/}//g'`/)"
+ H5CONFIG_F_RKIND="INTEGER, DIMENSION(1:num_rkinds) :: rkind = (/`echo $PAC_FC_ALL_REAL_KINDS | sed -e 's/{//g' | sed -e 's/}//g' | sed -e 's/ /,/g'`/)"
+ H5CONFIG_F_RKIND_SIZEOF="INTEGER, DIMENSION(1:num_rkinds) :: rkind_sizeof = (/`echo $PAC_FC_ALL_REAL_KINDS_SIZEOF | sed -e 's/{//g' | sed -e 's/}//g'| sed -e 's/ /,/g'`/)"
cat >>confdefs.h <<_ACEOF
diff --git a/configure.ac b/configure.ac
index 8ea73eb..e7215af 100644
--- a/configure.ac
+++ b/configure.ac
@@ -596,8 +596,9 @@ if test "X$HDF_FORTRAN" = "Xyes"; then
dnl count the number of real kinds
H5CONFIG_F_NUM_RKIND="INTEGER, PARAMETER :: num_rkinds = `echo \"[$]PAC_FC_ALL_REAL_KINDS\" | perl -e '$count = (<STDIN> =~ tr/,//);print $count+1'`"
- H5CONFIG_F_RKIND="INTEGER, DIMENSION(1:num_rkinds) :: rkind = (/`echo $PAC_FC_ALL_REAL_KINDS | sed -e 's/{//g' | sed -e 's/}//g'`/)"
- H5CONFIG_F_RKIND_SIZEOF="INTEGER, DIMENSION(1:num_rkinds) :: rkind_sizeof = (/`echo $PAC_FC_ALL_REAL_KINDS_SIZEOF | sed -e 's/{//g' | sed -e 's/}//g'`/)"
+ H5CONFIG_F_RKIND="INTEGER, DIMENSION(1:num_rkinds) :: rkind = (/`echo $PAC_FC_ALL_REAL_KINDS | sed -e 's/{//g' | sed -e 's/}//g' | sed -e 's/ /,/g'`/)"
+ dnl H5CONFIG_F_RKIND="INTEGER, DIMENSION(1:num_rkinds) :: rkind = (`echo \"[$]PAC_FC_ALL_REAL_KINDS\" | $PERL -pe 'tr |{}|//|' | $PERL -e 's/ /,/g`)"
+ H5CONFIG_F_RKIND_SIZEOF="INTEGER, DIMENSION(1:num_rkinds) :: rkind_sizeof = (/`echo $PAC_FC_ALL_REAL_KINDS_SIZEOF | sed -e 's/{//g' | sed -e 's/}//g'| sed -e 's/ /,/g'`/)"
AC_DEFINE_UNQUOTED([H5CONFIG_F_NUM_RKIND], $H5CONFIG_F_NUM_RKIND, [Define number of valid Fortran REAL KINDs])
AC_DEFINE_UNQUOTED([H5CONFIG_F_RKIND], $H5CONFIG_F_RKIND, [Define valid Fortran REAL KINDs])
diff --git a/m4/aclocal_fc.m4 b/m4/aclocal_fc.m4
index a9d18ba..0bb66a1 100644
--- a/m4/aclocal_fc.m4
+++ b/m4/aclocal_fc.m4
@@ -584,6 +584,8 @@ rm -f pac_Cconftest.out
])
AC_RUN_IFELSE([],[
if test -s pac_Cconftest.out ; then
+dnl LDBL_DIG="`perl -ne '$. == 1 && print && exit'`"
+dnl FLT128_DIG="`perl -ne '$. == 2 && print && exit'`"
LDBL_DIG="`sed -n '1p' pac_Cconftest.out`"
FLT128_DIG="`sed -n '2p' pac_Cconftest.out`"
else