diff options
author | Mike McGreevy <mamcgree@hdfgroup.org> | 2008-11-18 20:22:51 (GMT) |
---|---|---|
committer | Mike McGreevy <mamcgree@hdfgroup.org> | 2008-11-18 20:22:51 (GMT) |
commit | 374f8f9da5cbe8ad9523f600989560dc110de40f (patch) | |
tree | 4a31eebaf31eda6be264859d48c6a9bc59864051 | |
parent | e012505802452518fff2cb17bfbb546a702ac9a9 (diff) | |
download | hdf5-374f8f9da5cbe8ad9523f600989560dc110de40f.zip hdf5-374f8f9da5cbe8ad9523f600989560dc110de40f.tar.gz hdf5-374f8f9da5cbe8ad9523f600989560dc110de40f.tar.bz2 |
[svn-r16096] Purpose: Updating bin/reconfigure script
Updating bin/reconfigure script to point to autotools in /mnt/hdf/packages,
since /home1/packages no longer exists.
Tested: kagiso
-rwxr-xr-x | bin/reconfigure | 12 | ||||
-rwxr-xr-x | configure | 2 | ||||
-rw-r--r-- | src/H5I.c | 1 | ||||
-rw-r--r-- | src/H5Pdapl.c | 2 |
4 files changed, 10 insertions, 7 deletions
diff --git a/bin/reconfigure b/bin/reconfigure index f9fe719..05e52ba 100755 --- a/bin/reconfigure +++ b/bin/reconfigure @@ -41,19 +41,19 @@ LIBTOOL_VERSION="(GNU libtool) 2.2.6" # If paths to autotools are not specified by the user, assume tools are # running on kagiso and set paths accordingly. if test -z ${AUTOCONF}; then - AUTOCONF=/home1/packages/autoconf/autoconf-2.61/bin/autoconf + AUTOCONF=/mnt/hdf/packages/autoconf/autoconf-2.61/bin/autoconf fi if test -z ${AUTOMAKE}; then - AUTOMAKE=/home1/packages/automake/automake-1.10.1/bin/automake-1.10 + AUTOMAKE=/mnt/hdf/packages/automake/automake-1.10.1/bin/automake-1.10 fi if test -z ${AUTOHEADER}; then - AUTOHEADER=/home1/packages/autoconf/autoconf-2.61/bin/autoheader + AUTOHEADER=/mnt/hdf/packages/autoconf/autoconf-2.61/bin/autoheader fi if test -z ${ACLOCAL}; then - ACLOCAL=/home1/packages/automake/automake-1.10.1/bin/aclocal-1.10 + ACLOCAL=/mnt/hdf/packages/automake/automake-1.10.1/bin/aclocal-1.10 fi if test -z ${LIBTOOL}; then - LIBTOOL=/home1/packages/libtool/libtool-2.2.6a/bin/libtool + LIBTOOL=/mnt/hdf/packages/libtool/libtool-2.2.6a/bin/libtool fi # Check version numbers of all autotools against the "correct" versions @@ -84,7 +84,7 @@ if test -z "${LT_VERS}"; then fi # Use the latest version of M4 -PATH=/home1/packages/m4/m4-1.4.7/bin:/home1/packages/m4/m4-1.4.7/share:$PATH +PATH=/mnt/hdf/packages/m4/m4-1.4.7/bin:/mnt/hdf/packages/m4/m4-1.4.7/share:$PATH # Make sure that the tools are in the path. AUTOCONF_DIR=`dirname ${AUTOCONF}` @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in Id: configure.in 16058 2008-11-10 21:45:46Z epourmal . +# From configure.in Id: configure.in 16069 2008-11-12 21:53:30Z epourmal . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.61 for HDF5 1.8.2-snap0. # @@ -1867,6 +1867,7 @@ H5Iis_valid(hid_t id) htri_t ret_value = TRUE; /* Return value */ FUNC_ENTER_API(H5Iis_valid, FAIL) + H5TRACE1("t", "i", id); type = H5I_TYPE(id); /* Check for conditions that would cause H5I_find_id to throw an assertion */ diff --git a/src/H5Pdapl.c b/src/H5Pdapl.c index eefcca6..a4d036d 100644 --- a/src/H5Pdapl.c +++ b/src/H5Pdapl.c @@ -182,6 +182,7 @@ H5Pset_chunk_cache(hid_t dapl_id, size_t rdcc_nslots, size_t rdcc_nbytes, double herr_t ret_value = SUCCEED; /* return value */ FUNC_ENTER_API(H5Pset_chunk_cache, FAIL); + H5TRACE4("e", "izzd", dapl_id, rdcc_nslots, rdcc_nbytes, rdcc_w0); /* Check arguments. Note that we allow negative values - they are * considered to "unset" the property. */ @@ -233,6 +234,7 @@ H5Pget_chunk_cache(hid_t dapl_id, size_t *rdcc_nslots, size_t *rdcc_nbytes, doub herr_t ret_value = SUCCEED; /* return value */ FUNC_ENTER_API(H5Pget_chunk_cache, FAIL); + H5TRACE4("e", "i*z*z*d", dapl_id, rdcc_nslots, rdcc_nbytes, rdcc_w0); /* Get the plist structure */ if (NULL == (plist = H5P_object_verify(dapl_id, H5P_DATASET_ACCESS))) |