From d546d568964e085cec3add0e9a990a19f9f84f1e Mon Sep 17 00:00:00 2001
From: Quincey Koziol <koziol@hdfgroup.org>
Date: Tue, 12 Jan 2010 11:07:33 -0500
Subject: [svn-r18104] Description: 	Minor brush-clearing changes to
 converge metadata_journaling branch and trunk.

Tested on:
	Mac OS X/32 10.6.2 (amazon) debug & prod
	(h5committest not required on this branch)
---
 bin/reconfigure | 22 +++++++++++-----------
 src/H5AC.c      |  2 +-
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/bin/reconfigure b/bin/reconfigure
index 4665dae..65a46bc 100755
--- a/bin/reconfigure
+++ b/bin/reconfigure
@@ -28,11 +28,11 @@
 # of versions that can get confused (not even counting the m4 utility)!
 
 # HDF5 currently uses the following versions of the autotools:
-AUTOCONF_VERSION="autoconf (GNU Autoconf) 2.61"
-AUTOMAKE_VERSION="automake (GNU automake) 1.10.1"
-AUTOHEADER_VERSION="autoheader (GNU Autoconf) 2.61"
-ACLOCAL_VERSION="aclocal (GNU automake) 1.10.1"
-LIBTOOL_VERSION="(GNU libtool) 2.2.2"
+AUTOCONF_VERSION="autoconf (GNU Autoconf) 2.64"
+AUTOMAKE_VERSION="automake (GNU automake) 1.11"
+AUTOHEADER_VERSION="autoheader (GNU Autoconf) 2.64"
+ACLOCAL_VERSION="aclocal (GNU automake) 1.11"
+LIBTOOL_VERSION="(GNU libtool) 2.2.6"
 #
 # When upgrading automake's version, don't forget to also update its
 # helper utilities, especially depcomp.
@@ -41,19 +41,19 @@ LIBTOOL_VERSION="(GNU libtool) 2.2.2"
 # 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.64/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.11/bin/automake-1.11
 fi
 if test -z ${AUTOHEADER}; then
-  AUTOHEADER=/home1/packages/autoconf/autoconf-2.61/bin/autoheader
+  AUTOHEADER=/mnt/hdf/packages/autoconf/autoconf-2.64/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.11/bin/aclocal-1.11
 fi
 if test -z ${LIBTOOL}; then
-  LIBTOOL=/home1/packages/libtool/libtool-2.2.2/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}`
diff --git a/src/H5AC.c b/src/H5AC.c
index 0153360..2046822 100644
--- a/src/H5AC.c
+++ b/src/H5AC.c
@@ -513,7 +513,7 @@ H5AC_create(const H5F_t *f,
 
     HDassert(f);
     HDassert(NULL == f->shared->cache);
-    HDassert(config_ptr != NULL) ;
+    HDassert(config_ptr != NULL);
     HDcompile_assert(NELMTS(H5AC_entry_type_names) == H5AC_NTYPES);
     HDcompile_assert(H5C__MAX_NUM_TYPE_IDS == H5AC_NTYPES);
 
-- 
cgit v0.12