diff options
author | Mike McGreevy <mamcgree@hdfgroup.org> | 2009-10-15 21:14:27 (GMT) |
---|---|---|
committer | Mike McGreevy <mamcgree@hdfgroup.org> | 2009-10-15 21:14:27 (GMT) |
commit | 21518fd05a3777c20c69ce214a2f6da54ae8dfe0 (patch) | |
tree | 7dc1a959982584875753b64ae568bf1b45246aa0 /config | |
parent | 7e0e1bcc1baccb5e72e6d0c49a38d41249503cf8 (diff) | |
download | hdf5-21518fd05a3777c20c69ce214a2f6da54ae8dfe0.zip hdf5-21518fd05a3777c20c69ce214a2f6da54ae8dfe0.tar.gz hdf5-21518fd05a3777c20c69ce214a2f6da54ae8dfe0.tar.bz2 |
[svn-r17654] Purpose:
Configure cache-val cleanup
Description:
Corrected some misnamed cache values in configure / config files.
Tested:
h5committest
Diffstat (limited to 'config')
-rw-r--r-- | config/ia64-linux-gnu | 4 | ||||
-rw-r--r-- | config/irix6.x | 10 | ||||
-rw-r--r-- | config/linux-gnulibc1 | 8 | ||||
-rw-r--r-- | config/mpich | 18 | ||||
-rw-r--r-- | config/nec-superux14.1 | 4 | ||||
-rw-r--r-- | config/powerpc-ibm-aix5.x | 2 | ||||
-rw-r--r-- | config/x86_64-redstorm-linux-gnu | 2 |
7 files changed, 24 insertions, 24 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'} |