[svn-r17654] Purpose:

    Configure cache-val cleanup

Description:

    Corrected some misnamed cache values in configure / config files.

Tested:

    h5committest

11 files changed, 97 insertions, 97 deletions

diff --git a/config/ia64-linux-gnu b/config/ia64-linux-gnu
index a0b3945..1961119 100644
--- a/config/ia64-linux-gnu
+++ b/config/ia64-linux-gnu
@@ -146,8 +146,8 @@ esac
 # Check MPICH settings
 . $srcdir/config/mpich
 #Uncomment the next line if your system doesn't support MPI complex derived datatype.
-#hdf5_mpi_complex_derived_datatype_works=${hdf5_mpi_complex_derived_datatype_works='no'}
+#hdf5_cv_mpi_complex_derived_datatype_works=${hdf5_cv_mpi_complex_derived_datatype_works='no'}
 #Comment out the following line if your system supports collective IO when some processes
 #don't have any contributions to IOs.
-hdf5_mpi_special_collective_io_works=${hdf5_mpi_special_collective_io_works='no'}
+hdf5_cv_mpi_special_collective_io_works=${hdf5_cv_mpi_special_collective_io_works='no'}
 
diff --git a/config/irix6.x b/config/irix6.x
index 1f5bbee..9bd9c4c 100644
--- a/config/irix6.x
+++ b/config/irix6.x
@@ -176,18 +176,18 @@ hdf5_cv_integer_to_ldouble_accurate=${hdf5_cv_integer_to_ldouble_accurate='no'}
 # Versions 7.4.2m or newer work.
 # Up to version 7.4.4m, it cannot handle collective IO with non-contribution 
 # of some processes.
-# Fix $hdf5_mpi_complex_derived_datatype_works if it is not set and is using cc.
-if [ -z "$hdf5_mpi_complex_derived_datatype_works" -a $CC_BASENAME = cc ]; then
+# Fix $hdf5_cv_mpi_complex_derived_datatype_works if it is not set and is using cc.
+if [ -z "$hdf5_cv_mpi_complex_derived_datatype_works" -a $CC_BASENAME = cc ]; then
     ccversion=`$CC -version 2>&1 | sed -e 's/.*Version //p'`
     ccversion1=`echo $ccversion | cut -f1 -d.`
     ccversion2=`echo $ccversion | cut -f2 -d.`
     # Assume all versions 7.4.* or newer are okay
     # and assume ccversion2 is never larger than 99.
     ccversionval=`expr $ccversion1 \* 100 + $ccversion2`
-    hdf5_mpi_special_collective_io_works='no'
+    hdf5_cv_mpi_special_collective_io_works='no'
     if [ $ccversionval -lt 704 ]; then
-        hdf5_mpi_complex_derived_datatype_works='no'
-#        hdf5_mpi_special_collective_io_works='no'
+        hdf5_cv_mpi_complex_derived_datatype_works='no'
+#        hdf5_cv_mpi_special_collective_io_works='no'
     fi
 fi
 
diff --git a/config/linux-gnulibc1 b/config/linux-gnulibc1
index 8c64734..667f04e 100644
--- a/config/linux-gnulibc1
+++ b/config/linux-gnulibc1
@@ -122,12 +122,12 @@ fi
 #     1. collective I/O when some processes don't have any contributions;
 #     2. complex derived MPI data type.
 if test $CC_BASENAME = cmpicc; then
-  hdf5_mpi_special_collective_io_works=${hdf5_mpi_special_collective_io_works='no'}
-  hdf5_mpi_complex_derived_datatype_works=${hdf5_mpi_complex_derived_datatype_works='no'}
+  hdf5_cv_mpi_special_collective_io_works=${hdf5_cv_mpi_special_collective_io_works='no'}
+  hdf5_cv_mpi_complex_derived_datatype_works=${hdf5_cv_mpi_complex_derived_datatype_works='no'}
 fi
 
 #Comment out the following line if your system supports collective IO when some processes
 #don't have any contributions to IOs.
-hdf5_mpi_special_collective_io_works=${hdf5_mpi_special_collective_io_works='no'}
-hdf5_mpi_complex_derived_datatype_works=${hdf5_mpi_complex_derived_datatype_works='no'}
+hdf5_cv_mpi_special_collective_io_works=${hdf5_cv_mpi_special_collective_io_works='no'}
+hdf5_cv_mpi_complex_derived_datatype_works=${hdf5_cv_mpi_complex_derived_datatype_works='no'}
 
diff --git a/config/mpich b/config/mpich
index 1ba62ff..575859e 100644
--- a/config/mpich
+++ b/config/mpich
@@ -21,14 +21,14 @@
 # We know that mpich 1.2.4 and 1.2.5 do not support it correctly.  We assume
 # older versions do not work either.  We don't know of a way of testing its
 # correctness without the risk of hanging the configure process.  So, we
-# set the configure variable hdf5_mpi_complex_derived_datatype_works to no.
+# set the configure variable hdf5_cv_mpi_complex_derived_datatype_works to no.
 # Notice that this code works only if the mpicc compiler shows its $MPIVERSION
 # properly.  It is confirmed mpicc does that as far back as v1.2.3.
 
 # mpich2 do not support it correctly.  But mpich2 reports small version number
 # indistiguishable from mpich.  Some mpich2 reports blank, some reports 1.0.2.
 
-if [ -z "$hdf5_mpi_complex_derived_datatype_works" ]; then
+if [ -z "$hdf5_cv_mpi_complex_derived_datatype_works" ]; then
     ccversion=`$CC -v 2>/dev/null`
     # mpich compiler will give "mpicc for 1.2.x ..."
     if echo "$ccversion" | grep '^mpicc for' > /dev/null ; then
@@ -36,16 +36,16 @@ if [ -z "$hdf5_mpi_complex_derived_datatype_works" ]; then
         ccversion=`echo $ccversion | cut -f3 -d' '`
 	case "$ccversion" in
 	    1.2.[0-5]*)
-		hdf5_mpi_complex_derived_datatype_works='no'
+		hdf5_cv_mpi_complex_derived_datatype_works='no'
 		;;
 	    1.0.2)
 		# mpich2 is recycling the version number, some report
 		# 1.0.2, some report blank.
-		hdf5_mpi_complex_derived_datatype_works='no'
+		hdf5_cv_mpi_complex_derived_datatype_works='no'
 		;;
 	    "")
 		# got blank ccversion.  Assume it is bad a mpich2.
-		hdf5_mpi_complex_derived_datatype_works='no'
+		hdf5_cv_mpi_complex_derived_datatype_works='no'
 		;;
 	    *)
 		# assume okay
@@ -54,7 +54,7 @@ if [ -z "$hdf5_mpi_complex_derived_datatype_works" ]; then
     fi
 fi
 
-if [ -z "$hdf5_mpi_special_collective_io_works" ]; then
+if [ -z "$hdf5_cv_mpi_special_collective_io_works" ]; then
     ccversion=`$CC -v 2>/dev/null`
     # mpich compiler will give "mpicc for 1.2.x ..."
     if echo "$ccversion" | grep '^mpicc for' > /dev/null ; then
@@ -62,16 +62,16 @@ if [ -z "$hdf5_mpi_special_collective_io_works" ]; then
         ccversion=`echo $ccversion | cut -f3 -d' '`
 	case "$ccversion" in
 	    1.2.[0-6]*)
-		hdf5_mpi_special_collective_io_works='no'
+		hdf5_cv_mpi_special_collective_io_works='no'
 		;;
 	    1.0.2)
 		# mpich2 is recycling the version number, some report
 		# 1.0.2, some report blank.
-		hdf5_mpi_special_collective_io_works='no'
+		hdf5_cv_mpi_special_collective_io_works='no'
 		;;
 	    "")
 		# got blank ccversion.  Assume it is bad a mpich2.
-		hdf5_mpi_special_collective_io_works='no'
+		hdf5_cv_mpi_special_collective_io_works='no'
 		;;
 	    *)
 		# assume okay
diff --git a/config/nec-superux14.1 b/config/nec-superux14.1
index 2ead4d0..dc1a15d 100644
--- a/config/nec-superux14.1
+++ b/config/nec-superux14.1
@@ -172,8 +172,8 @@ hdf5_cv_ldouble_to_uint_work=no
 hdf5_cv_ullong_to_fp_cast_works=yes
 hdf5_cv_ullong_to_ldouble_precision_works=no
 hdf5_cv_fp_to_integer_overflow_works=yes
-hdf5_fp_to_ullong_accurate=no
-hdf5_fp_to_ullong_right_maximum=no
+hdf5_cv_fp_to_ullong_accurate=no
+hdf5_cv_fp_to_ullong_right_maximum=no
 CONFIGURE_LIBS=/usr/lib/libi90sxe.a
 
 
diff --git a/config/powerpc-ibm-aix5.x b/config/powerpc-ibm-aix5.x
index 45cbd89..e7bb90f 100644
--- a/config/powerpc-ibm-aix5.x
+++ b/config/powerpc-ibm-aix5.x
@@ -153,7 +153,7 @@ fi
 # With poe version 3.2.0.19 or lower(using lpp -l all | grep ppe.poe to check the version number, 
 # IBM MPI-IO implementation has a bug, 
 #it cannot generate correct MPI derived datatype. Please uncomment the following line:
-#hdf5_mpi_complex_derived_datatype_works=${hdf5_mpi_complex_derived_datatype_works='no'}
+#hdf5_cv_mpi_complex_derived_datatype_works=${hdf5_cv_mpi_complex_derived_datatype_works='no'}
 
 # The default C++ compiler
 
diff --git a/config/x86_64-redstorm-linux-gnu b/config/x86_64-redstorm-linux-gnu
index 102e836..0cd2d73 100644
--- a/config/x86_64-redstorm-linux-gnu
+++ b/config/x86_64-redstorm-linux-gnu
@@ -163,4 +163,4 @@ hdf5_cv_ullong_to_ldouble_precision_works=${hdf5_cv_ullong_to_ldouble_precision_
 hdf5_cv_vsnprintf_works=${hdf5_cv_vsnprintf_works='yes'}
 hdf5_cv_fp_to_integer_overflow_works=${hdf5_cv_fp_to_integer_overflow_works='yes'}
 # mpich2 used has derived datatype errors.
-hdf5_mpi_complex_derived_datatype_works=${hdf5_mpi_complex_derived_datatype_works='no'}
+hdf5_cv_mpi_complex_derived_datatype_works=${hdf5_cv_mpi_complex_derived_datatype_works='no'}
diff --git a/configure b/configure
index 8d026b9..3001dbe 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Id: configure.in 17643 2009-10-14 21:43:05Z mamcgree .
+# From configure.in Id: configure.in 17647 2009-10-15 18:11:56Z epourmal .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.64 for HDF5 1.9.49.
 #
@@ -26656,11 +26656,11 @@ $as_echo_n "checking if irregular hyperslab optimization code works inside MPI-I
 if test "${hdf5_cv_mpi_complex_derived_datatype_works+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
-  hdf5_mpi_complex_derived_datatype_works=yes
+  hdf5_cv_mpi_complex_derived_datatype_works=yes
 fi
 
 
-if test ${hdf5_mpi_complex_derived_datatype_works} = "yes"; then
+if test ${hdf5_cv_mpi_complex_derived_datatype_works} = "yes"; then
 
 $as_echo "#define MPI_COMPLEX_DERIVED_DATATYPE_WORKS 1" >>confdefs.h
 
@@ -26678,11 +26678,11 @@ $as_echo_n "checking if MPI-IO can do collective IO when one or more processes d
 if test "${hdf5_cv_mpi_special_collective_io_works+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
-  hdf5_mpi_special_collective_io_works=yes
+  hdf5_cv_mpi_special_collective_io_works=yes
 fi
 
 
-if test ${hdf5_mpi_special_collective_io_works} = "yes"; then
+if test ${hdf5_cv_mpi_special_collective_io_works} = "yes"; then
 
 $as_echo "#define MPI_SPECIAL_COLLECTIVE_IO_WORKS 1" >>confdefs.h
 
@@ -26855,14 +26855,14 @@ posix_memalign()
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
-  hdf5_direct_io=yes
+  hdf5_cv_direct_io=yes
 else
-  hdf5_direct_io=no
+  hdf5_cv_direct_io=no
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 else
-  hdf5_direct_io=no
+  hdf5_cv_direct_io=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
   conftest.$ac_objext conftest.beam conftest.$ac_ext
@@ -26871,7 +26871,7 @@ fi
 fi
 
 
-   if test ${hdf5_direct_io} = "yes"; then
+   if test ${hdf5_cv_direct_io} = "yes"; then
       { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 
@@ -26999,7 +26999,7 @@ esac
 $as_echo_n "checking if converting from long double to integers is accurate... " >&6; }
 
 if test ${ac_cv_sizeof_long_double} = 0; then
-   hdf5_ldouble_to_integer_accurate=${hdf5_ldouble_to_integer_accurate=no}
+   hdf5_cv_ldouble_to_integer_accurate=${hdf5_cv_ldouble_to_integer_accurate=no}
 else
    if test "${hdf5_cv_ldouble_to_integer_accurate+set}" = set; then :
   $as_echo_n "(cached) " >&6
@@ -27025,7 +27025,7 @@ fi
 $as_echo_n "checking if converting from long double to integers works... " >&6; }
 
 if test ${ac_cv_sizeof_long_double} = 0; then
-   hdf5_ldouble_to_integer_works=${hdf5_ldouble_to_integer_works=no}
+   hdf5_cv_ldouble_to_integer_works=${hdf5_cv_ldouble_to_integer_works=no}
 else
    if test "${hdf5_cv_ldouble_to_integer_works+set}" = set; then :
   $as_echo_n "(cached) " >&6
@@ -27063,9 +27063,9 @@ else
 
 _ACEOF
 if ac_fn_c_try_run "$LINENO"; then :
-  hdf5_ldouble_to_integer_works=yes
+  hdf5_cv_ldouble_to_integer_works=yes
 else
-  hdf5_ldouble_to_integer_works=no
+  hdf5_cv_ldouble_to_integer_works=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
   conftest.$ac_objext conftest.beam conftest.$ac_ext
@@ -27075,7 +27075,7 @@ fi
 
 fi
 
-if test ${hdf5_ldouble_to_integer_works} = "yes"; then
+if test ${hdf5_cv_ldouble_to_integer_works} = "yes"; then
 
 $as_echo "#define LDOUBLE_TO_INTEGER_WORKS 1" >>confdefs.h
 
@@ -27156,9 +27156,9 @@ done:
 
 _ACEOF
 if ac_fn_c_try_run "$LINENO"; then :
-  hdf5_ulong_to_float_accurate=yes
+  hdf5_cv_ulong_to_float_accurate=yes
 else
-  hdf5_ulong_to_float_accurate=no
+  hdf5_cv_ulong_to_float_accurate=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
   conftest.$ac_objext conftest.beam conftest.$ac_ext
@@ -27167,7 +27167,7 @@ fi
 fi
 
 
-if test ${hdf5_ulong_to_float_accurate} = "yes"; then
+if test ${hdf5_cv_ulong_to_float_accurate} = "yes"; then
 
 $as_echo "#define ULONG_TO_FLOAT_ACCURATE 1" >>confdefs.h
 
@@ -27320,9 +27320,9 @@ done:
 
 _ACEOF
 if ac_fn_c_try_run "$LINENO"; then :
-  hdf5_fp_to_ullong_accurate=yes
+  hdf5_cv_fp_to_ullong_accurate=yes
 else
-  hdf5_fp_to_ullong_accurate=no
+  hdf5_cv_fp_to_ullong_accurate=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
   conftest.$ac_objext conftest.beam conftest.$ac_ext
@@ -27331,7 +27331,7 @@ fi
 fi
 
 
-if test ${hdf5_fp_to_ullong_accurate} = "yes"; then
+if test ${hdf5_cv_fp_to_ullong_accurate} = "yes"; then
 
 $as_echo "#define FP_TO_ULLONG_ACCURATE 1" >>confdefs.h
 
@@ -27383,9 +27383,9 @@ done:
 
 _ACEOF
 if ac_fn_c_try_run "$LINENO"; then :
-  hdf5_fp_to_ullong_right_maximum=yes
+  hdf5_cv_fp_to_ullong_right_maximum=yes
 else
-  hdf5_fp_to_ullong_right_maximum=no
+  hdf5_cv_fp_to_ullong_right_maximum=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
   conftest.$ac_objext conftest.beam conftest.$ac_ext
@@ -27394,7 +27394,7 @@ fi
 fi
 
 
-if test ${hdf5_fp_to_ullong_right_maximum} = "yes"; then
+if test ${hdf5_cv_fp_to_ullong_right_maximum} = "yes"; then
 
 $as_echo "#define FP_TO_ULLONG_RIGHT_MAXIMUM 1" >>confdefs.h
 
@@ -27409,7 +27409,7 @@ fi
 $as_echo_n "checking if correctly converting long double to unsigned int values... " >&6; }
 
 if test ${ac_cv_sizeof_long_double} = 0; then
-   hdf5_ldouble_to_uint_accurate=${hdf5_ldouble_to_uint_accurate=no}
+   hdf5_cv_ldouble_to_uint_accurate=${hdf5_cv_ldouble_to_uint_accurate=no}
 else
    if test "${hdf5_cv_ldouble_to_uint_accurate+set}" = set; then :
   $as_echo_n "(cached) " >&6
@@ -27439,9 +27439,9 @@ else
 
 _ACEOF
 if ac_fn_c_try_run "$LINENO"; then :
-  hdf5_ldouble_to_uint_accurate=yes
+  hdf5_cv_ldouble_to_uint_accurate=yes
 else
-  hdf5_ldouble_to_uint_accurate=no
+  hdf5_cv_ldouble_to_uint_accurate=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
   conftest.$ac_objext conftest.beam conftest.$ac_ext
@@ -27451,7 +27451,7 @@ fi
 
 fi
 
-if test ${hdf5_ldouble_to_uint_accurate} = "yes"; then
+if test ${hdf5_cv_ldouble_to_uint_accurate} = "yes"; then
 
 $as_echo "#define LDOUBLE_TO_UINT_ACCURATE 1" >>confdefs.h
 
@@ -27670,7 +27670,7 @@ fi
 $as_echo_n "checking if correctly converting long double to (unsigned) long long values... " >&6; }
 
 if test ${ac_cv_sizeof_long_double} = 0; then
-   hdf5_ldouble_to_llong_accurate=${hdf5_ldouble_to_llong_accurate=no}
+   hdf5_cv_ldouble_to_llong_accurate=${hdf5_cv_ldouble_to_llong_accurate=no}
 else
    if test "${hdf5_cv_ldouble_to_llong_accurate+set}" = set; then :
   $as_echo_n "(cached) " >&6
@@ -27723,9 +27723,9 @@ else
 
 _ACEOF
 if ac_fn_c_try_run "$LINENO"; then :
-  hdf5_ldouble_to_llong_accurate=yes
+  hdf5_cv_ldouble_to_llong_accurate=yes
 else
-  hdf5_ldouble_to_llong_accurate=no
+  hdf5_cv_ldouble_to_llong_accurate=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
   conftest.$ac_objext conftest.beam conftest.$ac_ext
@@ -27735,7 +27735,7 @@ fi
 
 fi
 
-if test ${hdf5_ldouble_to_llong_accurate} = "yes"; then
+if test ${hdf5_cv_ldouble_to_llong_accurate} = "yes"; then
 
 $as_echo "#define LDOUBLE_TO_LLONG_ACCURATE 1" >>confdefs.h
 
@@ -27750,7 +27750,7 @@ fi
 $as_echo_n "checking if correctly converting (unsigned) long long to long double values... " >&6; }
 
 if test ${ac_cv_sizeof_long_double} = 0; then
-   hdf5_llong_to_ldouble_correct=${hdf5_llong_to_ldouble_correct=no}
+   hdf5_cv_llong_to_ldouble_correct=${hdf5_cv_llong_to_ldouble_correct=no}
 else
    if test "${hdf5_cv_llong_to_ldouble_correct+set}" = set; then :
   $as_echo_n "(cached) " >&6
@@ -27807,9 +27807,9 @@ else
 
 _ACEOF
 if ac_fn_c_try_run "$LINENO"; then :
-  hdf5_llong_to_ldouble_correct=yes
+  hdf5_cv_llong_to_ldouble_correct=yes
 else
-  hdf5_llong_to_ldouble_correct=no
+  hdf5_cv_llong_to_ldouble_correct=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
   conftest.$ac_objext conftest.beam conftest.$ac_ext
@@ -27819,7 +27819,7 @@ fi
 
 fi
 
-if test ${hdf5_llong_to_ldouble_correct} = "yes"; then
+if test ${hdf5_cv_llong_to_ldouble_correct} = "yes"; then
 
 $as_echo "#define LLONG_TO_LDOUBLE_CORRECT 1" >>confdefs.h
 
diff --git a/configure.in b/configure.in
index c5bacd7..446ded0 100644
--- a/configure.in
+++ b/configure.in
@@ -2744,9 +2744,9 @@ dnl bug also occurs at SGI IRIX 6.5 C with compiler version lower than or equal
 dnl In case people still use the old compiler, we keep this flag.
 AC_MSG_CHECKING([if irregular hyperslab optimization code works inside MPI-IO])
 
-AC_CACHE_VAL([hdf5_cv_mpi_complex_derived_datatype_works],[hdf5_mpi_complex_derived_datatype_works=yes])
+AC_CACHE_VAL([hdf5_cv_mpi_complex_derived_datatype_works],[hdf5_cv_mpi_complex_derived_datatype_works=yes])
 
-if test ${hdf5_mpi_complex_derived_datatype_works} = "yes"; then
+if test ${hdf5_cv_mpi_complex_derived_datatype_works} = "yes"; then
   AC_DEFINE([MPI_COMPLEX_DERIVED_DATATYPE_WORKS], [1],
             [Define if your system can handle complicated MPI derived datatype correctly.])
   AC_MSG_RESULT([yes])
@@ -2763,9 +2763,9 @@ dnl and SGI altix. For those systems, we have to turn off this feature and use i
 dnl
 AC_MSG_CHECKING([if MPI-IO can do collective IO when one or more processes don't do IOs])
 
-AC_CACHE_VAL([hdf5_cv_mpi_special_collective_io_works],[hdf5_mpi_special_collective_io_works=yes])
+AC_CACHE_VAL([hdf5_cv_mpi_special_collective_io_works],[hdf5_cv_mpi_special_collective_io_works=yes])
 
-if test ${hdf5_mpi_special_collective_io_works} = "yes"; then
+if test ${hdf5_cv_mpi_special_collective_io_works} = "yes"; then
   AC_DEFINE([MPI_SPECIAL_COLLECTIVE_IO_WORKS], [1],
             [Define if your system can handle special collective IO properly.])
   AC_MSG_RESULT([yes])
@@ -2905,9 +2905,9 @@ if test "$DIRECT_VFD" = "yes"; then
              close(fid);  
              remove("tst_file"); 
              exit (0);
-          }], AC_TRY_LINK(, [posix_memalign()], [hdf5_direct_io=yes], [hdf5_direct_io=no]), [hdf5_direct_io=no],)])
+          }], AC_TRY_LINK(, [posix_memalign()], [hdf5_cv_direct_io=yes], [hdf5_cv_direct_io=no]), [hdf5_cv_direct_io=no],)])
 
-   if test ${hdf5_direct_io} = "yes"; then
+   if test ${hdf5_cv_direct_io} = "yes"; then
       AC_MSG_RESULT([yes])
       AC_DEFINE([HAVE_DIRECT], [1],
                 [Define if the direct I/O virtual file driver should be compiled])
@@ -3026,7 +3026,7 @@ dnl
 AC_MSG_CHECKING([if converting from long double to integers is accurate])
 
 if test ${ac_cv_sizeof_long_double} = 0; then
-   hdf5_ldouble_to_integer_accurate=${hdf5_ldouble_to_integer_accurate=no}
+   hdf5_cv_ldouble_to_integer_accurate=${hdf5_cv_ldouble_to_integer_accurate=no}
 else
    AC_CACHE_VAL([hdf5_cv_ldouble_to_integer_accurate], [hdf5_cv_ldouble_to_integer_accurate=yes])
 fi
@@ -3050,7 +3050,7 @@ dnl yet. (1/8/05 - SLU)
 AC_MSG_CHECKING([if converting from long double to integers works])
 
 if test ${ac_cv_sizeof_long_double} = 0; then
-   hdf5_ldouble_to_integer_works=${hdf5_ldouble_to_integer_works=no}
+   hdf5_cv_ldouble_to_integer_works=${hdf5_cv_ldouble_to_integer_works=no}
 else
    AC_CACHE_VAL([hdf5_cv_ldouble_to_integer_works],
         [AC_TRY_RUN([
@@ -3075,10 +3075,10 @@ else
     done:
             exit(ret);
         }
-        ], [hdf5_ldouble_to_integer_works=yes], [hdf5_ldouble_to_integer_works=no],)])
+        ], [hdf5_cv_ldouble_to_integer_works=yes], [hdf5_cv_ldouble_to_integer_works=no],)])
 fi
 
-if test ${hdf5_ldouble_to_integer_works} = "yes"; then
+if test ${hdf5_cv_ldouble_to_integer_works} = "yes"; then
   AC_DEFINE([LDOUBLE_TO_INTEGER_WORKS], [1],
             [Define if your system can convert from long double to integer values.])
   AC_MSG_RESULT([yes])
@@ -3148,9 +3148,9 @@ AC_CACHE_VAL([hdf5_cv_ulong_to_float_accurate],
 done:
         exit(ret);
     }
-    ], [hdf5_ulong_to_float_accurate=yes], [hdf5_ulong_to_float_accurate=no],)])
+    ], [hdf5_cv_ulong_to_float_accurate=yes], [hdf5_cv_ulong_to_float_accurate=no],)])
 
-if test ${hdf5_ulong_to_float_accurate} = "yes"; then
+if test ${hdf5_cv_ulong_to_float_accurate} = "yes"; then
   AC_DEFINE([ULONG_TO_FLOAT_ACCURATE], [1],
             [Define if your system accurately converting unsigned long to float values.])
   AC_MSG_RESULT([yes])
@@ -3270,9 +3270,9 @@ AC_CACHE_VAL([hdf5_cv_fp_to_ullong_accurate],
 done:
         exit(ret);
     }
-    ], [hdf5_fp_to_ullong_accurate=yes], [hdf5_fp_to_ullong_accurate=no],)])
+    ], [hdf5_cv_fp_to_ullong_accurate=yes], [hdf5_cv_fp_to_ullong_accurate=no],)])
 
-if test ${hdf5_fp_to_ullong_accurate} = "yes"; then
+if test ${hdf5_cv_fp_to_ullong_accurate} = "yes"; then
   AC_DEFINE([FP_TO_ULLONG_ACCURATE], [1],
             [Define if your system roundup accurately converting floating-point to unsigned long long values.])
   AC_MSG_RESULT([yes])
@@ -3314,9 +3314,9 @@ AC_CACHE_VAL([hdf5_cv_fp_to_ullong_right_maximum],
 done:
         exit(ret);
     }
-    ], [hdf5_fp_to_ullong_right_maximum=yes], [hdf5_fp_to_ullong_right_maximum=no],)])
+    ], [hdf5_cv_fp_to_ullong_right_maximum=yes], [hdf5_cv_fp_to_ullong_right_maximum=no],)])
 
-if test ${hdf5_fp_to_ullong_right_maximum} = "yes"; then
+if test ${hdf5_cv_fp_to_ullong_right_maximum} = "yes"; then
   AC_DEFINE([FP_TO_ULLONG_RIGHT_MAXIMUM], [1],
             [Define if your system has right maximum convert floating-point to unsigned long long values.])
   AC_MSG_RESULT([yes])
@@ -3332,7 +3332,7 @@ dnl
 AC_MSG_CHECKING([if correctly converting long double to unsigned int values])
 
 if test ${ac_cv_sizeof_long_double} = 0; then
-   hdf5_ldouble_to_uint_accurate=${hdf5_ldouble_to_uint_accurate=no}
+   hdf5_cv_ldouble_to_uint_accurate=${hdf5_cv_ldouble_to_uint_accurate=no}
 else
    AC_CACHE_VAL([hdf5_cv_ldouble_to_uint_accurate],
         [AC_TRY_RUN([
@@ -3349,10 +3349,10 @@ else
     done:
             exit(ret);
         }
-        ], [hdf5_ldouble_to_uint_accurate=yes], [hdf5_ldouble_to_uint_accurate=no],)])
+        ], [hdf5_cv_ldouble_to_uint_accurate=yes], [hdf5_cv_ldouble_to_uint_accurate=no],)])
 fi
 
-if test ${hdf5_ldouble_to_uint_accurate} = "yes"; then
+if test ${hdf5_cv_ldouble_to_uint_accurate} = "yes"; then
   AC_DEFINE([LDOUBLE_TO_UINT_ACCURATE], [1],
             [Define if your system can convert long double to unsigned int values correctly.])
   AC_MSG_RESULT([yes])
@@ -3534,7 +3534,7 @@ dnl
 AC_MSG_CHECKING([if correctly converting long double to (unsigned) long long values])
 
 if test ${ac_cv_sizeof_long_double} = 0; then
-   hdf5_ldouble_to_llong_accurate=${hdf5_ldouble_to_llong_accurate=no}
+   hdf5_cv_ldouble_to_llong_accurate=${hdf5_cv_ldouble_to_llong_accurate=no}
 else
    AC_CACHE_VAL([hdf5_cv_ldouble_to_llong_accurate],
         [AC_TRY_RUN([
@@ -3574,10 +3574,10 @@ else
     done:
             exit(ret);
         }
-        ], [hdf5_ldouble_to_llong_accurate=yes], [hdf5_ldouble_to_llong_accurate=no],)])
+        ], [hdf5_cv_ldouble_to_llong_accurate=yes], [hdf5_cv_ldouble_to_llong_accurate=no],)])
 fi
 
-if test ${hdf5_ldouble_to_llong_accurate} = "yes"; then
+if test ${hdf5_cv_ldouble_to_llong_accurate} = "yes"; then
   AC_DEFINE([LDOUBLE_TO_LLONG_ACCURATE], [1],
             [Define if your system can convert long double to (unsigned) long long values correctly.])
   AC_MSG_RESULT([yes])
@@ -3595,7 +3595,7 @@ dnl
 AC_MSG_CHECKING([if correctly converting (unsigned) long long to long double values])
 
 if test ${ac_cv_sizeof_long_double} = 0; then
-   hdf5_llong_to_ldouble_correct=${hdf5_llong_to_ldouble_correct=no}
+   hdf5_cv_llong_to_ldouble_correct=${hdf5_cv_llong_to_ldouble_correct=no}
 else
    AC_CACHE_VAL([hdf5_cv_llong_to_ldouble_correct],
         [AC_TRY_RUN([
@@ -3639,10 +3639,10 @@ else
     done:
             exit(ret);
         }
-        ], [hdf5_llong_to_ldouble_correct=yes], [hdf5_llong_to_ldouble_correct=no],)])
+        ], [hdf5_cv_llong_to_ldouble_correct=yes], [hdf5_cv_llong_to_ldouble_correct=no],)])
 fi
 
-if test ${hdf5_llong_to_ldouble_correct} = "yes"; then
+if test ${hdf5_cv_llong_to_ldouble_correct} = "yes"; then
   AC_DEFINE([LLONG_TO_LDOUBLE_CORRECT], [1],
             [Define if your system can convert (unsigned) long long to long double values correctly.])
   AC_MSG_RESULT([yes])
diff --git a/src/Makefile.in b/src/Makefile.in
index 410607b..a192e40 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -98,15 +98,15 @@ libhdf5_la_LIBADD =
 am_libhdf5_la_OBJECTS = H5.lo H5checksum.lo H5dbg.lo H5system.lo \
 	H5timer.lo H5trace.lo H5A.lo H5Abtree2.lo H5Adense.lo \
 	H5Adeprec.lo H5Aint.lo H5Atest.lo H5AC.lo H5B.lo H5Bcache.lo \
-	H5Bdbg.lo H5B2.lo H5B2cache.lo H5B2dbg.lo H5B2hdr.lo H5B2int.lo \
-	H5B2stat.lo H5B2test.lo H5C.lo H5CS.lo H5D.lo H5Dbtree.lo \
-	H5Dchunk.lo H5Dcompact.lo H5Dcontig.lo H5Ddbg.lo H5Ddeprec.lo \
-	H5Defl.lo H5Dfill.lo H5Dint.lo H5Dio.lo H5Dlayout.lo \
-	H5Dmpio.lo H5Doh.lo H5Dscatgath.lo H5Dselect.lo H5Dtest.lo \
-	H5E.lo H5Edeprec.lo H5Eint.lo H5EA.lo H5EAcache.lo H5EAdbg.lo \
-	H5EAdblkpage.lo H5EAdblock.lo H5EAhdr.lo H5EAiblock.lo \
-	H5EAint.lo H5EAsblock.lo H5EAstat.lo H5EAtest.lo H5F.lo \
-	H5Faccum.lo H5Fdbg.lo H5Fdeprec.lo H5Ffake.lo H5Fio.lo \
+	H5Bdbg.lo H5B2.lo H5B2cache.lo H5B2dbg.lo H5B2hdr.lo \
+	H5B2int.lo H5B2stat.lo H5B2test.lo H5C.lo H5CS.lo H5D.lo \
+	H5Dbtree.lo H5Dchunk.lo H5Dcompact.lo H5Dcontig.lo H5Ddbg.lo \
+	H5Ddeprec.lo H5Defl.lo H5Dfill.lo H5Dint.lo H5Dio.lo \
+	H5Dlayout.lo H5Dmpio.lo H5Doh.lo H5Dscatgath.lo H5Dselect.lo \
+	H5Dtest.lo H5E.lo H5Edeprec.lo H5Eint.lo H5EA.lo H5EAcache.lo \
+	H5EAdbg.lo H5EAdblkpage.lo H5EAdblock.lo H5EAhdr.lo \
+	H5EAiblock.lo H5EAint.lo H5EAsblock.lo H5EAstat.lo H5EAtest.lo \
+	H5F.lo H5Faccum.lo H5Fdbg.lo H5Fdeprec.lo H5Ffake.lo H5Fio.lo \
 	H5Fmount.lo H5Fmpi.lo H5Fquery.lo H5Fsfile.lo H5Fsuper.lo \
 	H5Fsuper_cache.lo H5Ftest.lo H5FA.lo H5FAcache.lo H5FAdbg.lo \
 	H5FAdblock.lo H5FAdblkpage.lo H5FAhdr.lo H5FAstat.lo \
diff --git a/testpar/t_mpi.c b/testpar/t_mpi.c
index 09283e6..9033e70 100644
--- a/testpar/t_mpi.c
+++ b/testpar/t_mpi.c
@@ -849,7 +849,7 @@ static int test_mpio_derived_dtype(char *filename) {
 	    printf("Complicated derived datatype is NOT working at this platform\n");
 	    printf("Go back to hdf5/config and find the corresponding\n");
 	    printf("configure-specific file (for example, powerpc-ibm-aix5.x) and add\n");
-	    printf("hdf5_mpi_complex_derived_datatype_works=${hdf5_mpi_complex_derived_datatype-works='no'}\n");
+	    printf("hdf5_cv_mpi_complex_derived_datatype_works=${hdf5_cv_mpi_complex_derived_datatype-works='no'}\n");
 	    printf(" at the end of the file.\n");
 	    printf(" Please report to hdfhelp@ncsa.uiuc.edu about this problem.\n");
 	}
@@ -862,7 +862,7 @@ static int test_mpio_derived_dtype(char *filename) {
 	    printf("Complicated derived datatype is WORKING at this platform\n");
 	    printf(" Go back to hdf5/config and find the corresponding \n");
 	    printf(" configure-specific file (for example, powerpc-ibm-aix5.x) and delete the line\n");
-	    printf("hdf5_mpi_complex_derived_datatype_works=${hdf5_mpi_complex_derived_datatype-works='no'}\n");
+	    printf("hdf5_cv_mpi_complex_derived_datatype_works=${hdf5_cv_mpi_complex_derived_datatype-works='no'}\n");
 	    printf(" at the end of the file.\n");
 	    printf("Please report to hdfhelp@ncsa.uiuc.edu about this problem.\n");
 	}
@@ -1018,7 +1018,7 @@ test_mpio_special_collective(char *filename)
 	    printf("special collective IO is NOT working at this platform\n");
 	    printf("Go back to hdf5/config and find the corresponding\n");
 	    printf("configure-specific file (for example, powerpc-ibm-aix5.x) and add\n");
-	    printf("hdf5_mpi_special_collective_io_works=${hdf5_mpi_special_collective_io_works='no'}\n");
+	    printf("hdf5_cv_mpi_special_collective_io_works=${hdf5_cv_mpi_special_collective_io_works='no'}\n");
 	    printf(" at the end of the file.\n");
 	    printf(" Please report to hdfhelp@ncsa.uiuc.edu about this problem.\n");
 	}
@@ -1031,7 +1031,7 @@ test_mpio_special_collective(char *filename)
 	    printf("special collective IO is WORKING at this platform\n");
 	    printf(" Go back to hdf5/config and find the corresponding \n");
 	    printf(" configure-specific file (for example, powerpc-ibm-aix5.x) and delete the line\n");
-	    printf("hdf5_mpi_special_collective_io_works=${hdf5_mpi_special_collective_io_works='no'}\n");
+	    printf("hdf5_cv_mpi_special_collective_io_works=${hdf5_cv_mpi_special_collective_io_works='no'}\n");
 	    printf(" at the end of the file.\n");
 	    printf("Please report to hdfhelp@ncsa.uiuc.edu about this problem.\n");
 	}