[svn-r10517] Purpose:

Bug fix

Description:
On some machines, $RUNSERIAL variable needs to be used to run
tests.  Set $RUNTESTS (which is used for non-parallel tests) to
be $RUNSERIAL in configure.am.

Also, since I was updating all Makefiles.in anyway, I updated
commence.am to point to autotools installs in AFS instead of
those on heping.

Platforms tested:
mir, sleipnir, modi4, copper

10 files changed, 150 insertions, 60 deletions

diff --git a/tools/Makefile.in b/tools/Makefile.in
index a18751d..1f68bb9 100644
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@@ -75,18 +75,18 @@ CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 
-# Set the paths for autotools to be correct on heping.
+# Set the paths for AFS installs of autotools for Linux machines
 # Ideally, these tools should never be needed during the build.
-ACLOCAL = /usr/bin/aclocal
+ACLOCAL = /afs/ncsa/projects/hdf/packages/automake_1.9.5/Linux_2.4/bin/aclocal -I /afs/ncsa/projects/hdf/packages/libtool_1.5.14/Linux_2.4/share/aclocal
 ADD_PARALLEL_FILES = @ADD_PARALLEL_FILES@
 AMDEP_FALSE = @AMDEP_FALSE@
 AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AM_MAKEFLAGS = @AM_MAKEFLAGS@
 AR = @AR@
-AUTOCONF = /usr/local/autoconf-2.59/bin/autoconf
-AUTOHEADER = /usr/local/autoconf-2.59/bin/autoheader
-AUTOMAKE = /usr/bin/automake
+AUTOCONF = /afs/ncsa/projects/hdf/packages/autoconf_2.59/Linux_2.4/bin/autoconf
+AUTOHEADER = /afs/ncsa/projects/hdf/packages/autoconf_2.59/Linux_2.4/bin/autoheader
+AUTOMAKE = /afs/ncsa/projects/hdf/packages/automake_1.9.5/Linux_2.4/bin/automake
 AWK = @AWK@
 BUILD_CXX_CONDITIONAL_FALSE = @BUILD_CXX_CONDITIONAL_FALSE@
 BUILD_CXX_CONDITIONAL_TRUE = @BUILD_CXX_CONDITIONAL_TRUE@
@@ -257,6 +257,15 @@ target_alias = @target_alias@
 RM = rm -f
 CP = cp
 
+# Some machines need a command to run executables; this is that command
+# so that our tests will run.
+# We use RUNTESTS instead of RUNSERIAL directly because it may be that
+# some tests need to be run with a different command.  Older versions
+# of the makefiles used the command
+# $(LIBTOOL) --mode=execute
+# in some directories, for instance.
+RUNTESTS = $(RUNSERIAL)
+
 # Libraries to link to while building
 LIBHDF5 = $(top_builddir)/src/libhdf5.la
 LIBH5TEST = $(top_builddir)/test/libh5test.la
@@ -651,7 +660,7 @@ test _test: $(PROGS) $(TESTS)
 	      fi;                                                             \
 	      echo "============================";                            \
 	      srcdir="$(srcdir)"                                              \
-	         $(RUNTEST) ./$$test $(TEST_FLAGS) ||                         \
+	         $(RUNTESTS) ./$$test $(TEST_FLAGS) ||                         \
 	         (test $$HDF5_Make_Ignore && echo "*** Error ignored") ||     \
 	         break;                                                       \
 	      echo "";                                                        \
diff --git a/tools/gifconv/Makefile.in b/tools/gifconv/Makefile.in
index c4a87e1..71c944c 100644
--- a/tools/gifconv/Makefile.in
+++ b/tools/gifconv/Makefile.in
@@ -98,18 +98,18 @@ ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 
-# Set the paths for autotools to be correct on heping.
+# Set the paths for AFS installs of autotools for Linux machines
 # Ideally, these tools should never be needed during the build.
-ACLOCAL = /usr/bin/aclocal
+ACLOCAL = /afs/ncsa/projects/hdf/packages/automake_1.9.5/Linux_2.4/bin/aclocal -I /afs/ncsa/projects/hdf/packages/libtool_1.5.14/Linux_2.4/share/aclocal
 ADD_PARALLEL_FILES = @ADD_PARALLEL_FILES@
 AMDEP_FALSE = @AMDEP_FALSE@
 AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AM_MAKEFLAGS = @AM_MAKEFLAGS@
 AR = @AR@
-AUTOCONF = /usr/local/autoconf-2.59/bin/autoconf
-AUTOHEADER = /usr/local/autoconf-2.59/bin/autoheader
-AUTOMAKE = /usr/bin/automake
+AUTOCONF = /afs/ncsa/projects/hdf/packages/autoconf_2.59/Linux_2.4/bin/autoconf
+AUTOHEADER = /afs/ncsa/projects/hdf/packages/autoconf_2.59/Linux_2.4/bin/autoheader
+AUTOMAKE = /afs/ncsa/projects/hdf/packages/automake_1.9.5/Linux_2.4/bin/automake
 AWK = @AWK@
 BUILD_CXX_CONDITIONAL_FALSE = @BUILD_CXX_CONDITIONAL_FALSE@
 BUILD_CXX_CONDITIONAL_TRUE = @BUILD_CXX_CONDITIONAL_TRUE@
@@ -280,6 +280,15 @@ target_alias = @target_alias@
 RM = rm -f
 CP = cp
 
+# Some machines need a command to run executables; this is that command
+# so that our tests will run.
+# We use RUNTESTS instead of RUNSERIAL directly because it may be that
+# some tests need to be run with a different command.  Older versions
+# of the makefiles used the command
+# $(LIBTOOL) --mode=execute
+# in some directories, for instance.
+RUNTESTS = $(RUNSERIAL)
+
 # Libraries to link to while building
 LIBHDF5 = $(top_builddir)/src/libhdf5.la
 LIBH5TEST = $(top_builddir)/test/libh5test.la
@@ -654,7 +663,7 @@ test _test: $(PROGS) $(TESTS)
 	      fi;                                                             \
 	      echo "============================";                            \
 	      srcdir="$(srcdir)"                                              \
-	         $(RUNTEST) ./$$test $(TEST_FLAGS) ||                         \
+	         $(RUNTESTS) ./$$test $(TEST_FLAGS) ||                         \
 	         (test $$HDF5_Make_Ignore && echo "*** Error ignored") ||     \
 	         break;                                                       \
 	      echo "";                                                        \
diff --git a/tools/h5diff/Makefile.in b/tools/h5diff/Makefile.in
index 8147961..0019b27 100644
--- a/tools/h5diff/Makefile.in
+++ b/tools/h5diff/Makefile.in
@@ -106,18 +106,18 @@ ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 
-# Set the paths for autotools to be correct on heping.
+# Set the paths for AFS installs of autotools for Linux machines
 # Ideally, these tools should never be needed during the build.
-ACLOCAL = /usr/bin/aclocal
+ACLOCAL = /afs/ncsa/projects/hdf/packages/automake_1.9.5/Linux_2.4/bin/aclocal -I /afs/ncsa/projects/hdf/packages/libtool_1.5.14/Linux_2.4/share/aclocal
 ADD_PARALLEL_FILES = @ADD_PARALLEL_FILES@
 AMDEP_FALSE = @AMDEP_FALSE@
 AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AM_MAKEFLAGS = @AM_MAKEFLAGS@
 AR = @AR@
-AUTOCONF = /usr/local/autoconf-2.59/bin/autoconf
-AUTOHEADER = /usr/local/autoconf-2.59/bin/autoheader
-AUTOMAKE = /usr/bin/automake
+AUTOCONF = /afs/ncsa/projects/hdf/packages/autoconf_2.59/Linux_2.4/bin/autoconf
+AUTOHEADER = /afs/ncsa/projects/hdf/packages/autoconf_2.59/Linux_2.4/bin/autoheader
+AUTOMAKE = /afs/ncsa/projects/hdf/packages/automake_1.9.5/Linux_2.4/bin/automake
 AWK = @AWK@
 BUILD_CXX_CONDITIONAL_FALSE = @BUILD_CXX_CONDITIONAL_FALSE@
 BUILD_CXX_CONDITIONAL_TRUE = @BUILD_CXX_CONDITIONAL_TRUE@
@@ -288,6 +288,15 @@ target_alias = @target_alias@
 RM = rm -f
 CP = cp
 
+# Some machines need a command to run executables; this is that command
+# so that our tests will run.
+# We use RUNTESTS instead of RUNSERIAL directly because it may be that
+# some tests need to be run with a different command.  Older versions
+# of the makefiles used the command
+# $(LIBTOOL) --mode=execute
+# in some directories, for instance.
+RUNTESTS = $(RUNSERIAL)
+
 # Libraries to link to while building
 LIBHDF5 = $(top_builddir)/src/libhdf5.la
 LIBH5TEST = $(top_builddir)/test/libh5test.la
@@ -696,7 +705,7 @@ test _test: $(PROGS) $(TESTS)
 	      fi;                                                             \
 	      echo "============================";                            \
 	      srcdir="$(srcdir)"                                              \
-	         $(RUNTEST) ./$$test $(TEST_FLAGS) ||                         \
+	         $(RUNTESTS) ./$$test $(TEST_FLAGS) ||                         \
 	         (test $$HDF5_Make_Ignore && echo "*** Error ignored") ||     \
 	         break;                                                       \
 	      echo "";                                                        \
diff --git a/tools/h5dump/Makefile.in b/tools/h5dump/Makefile.in
index c302db7..d387436 100644
--- a/tools/h5dump/Makefile.in
+++ b/tools/h5dump/Makefile.in
@@ -99,18 +99,18 @@ ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 
-# Set the paths for autotools to be correct on heping.
+# Set the paths for AFS installs of autotools for Linux machines
 # Ideally, these tools should never be needed during the build.
-ACLOCAL = /usr/bin/aclocal
+ACLOCAL = /afs/ncsa/projects/hdf/packages/automake_1.9.5/Linux_2.4/bin/aclocal -I /afs/ncsa/projects/hdf/packages/libtool_1.5.14/Linux_2.4/share/aclocal
 ADD_PARALLEL_FILES = @ADD_PARALLEL_FILES@
 AMDEP_FALSE = @AMDEP_FALSE@
 AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AM_MAKEFLAGS = @AM_MAKEFLAGS@
 AR = @AR@
-AUTOCONF = /usr/local/autoconf-2.59/bin/autoconf
-AUTOHEADER = /usr/local/autoconf-2.59/bin/autoheader
-AUTOMAKE = /usr/bin/automake
+AUTOCONF = /afs/ncsa/projects/hdf/packages/autoconf_2.59/Linux_2.4/bin/autoconf
+AUTOHEADER = /afs/ncsa/projects/hdf/packages/autoconf_2.59/Linux_2.4/bin/autoheader
+AUTOMAKE = /afs/ncsa/projects/hdf/packages/automake_1.9.5/Linux_2.4/bin/automake
 AWK = @AWK@
 BUILD_CXX_CONDITIONAL_FALSE = @BUILD_CXX_CONDITIONAL_FALSE@
 BUILD_CXX_CONDITIONAL_TRUE = @BUILD_CXX_CONDITIONAL_TRUE@
@@ -281,6 +281,15 @@ target_alias = @target_alias@
 RM = rm -f
 CP = cp
 
+# Some machines need a command to run executables; this is that command
+# so that our tests will run.
+# We use RUNTESTS instead of RUNSERIAL directly because it may be that
+# some tests need to be run with a different command.  Older versions
+# of the makefiles used the command
+# $(LIBTOOL) --mode=execute
+# in some directories, for instance.
+RUNTESTS = $(RUNSERIAL)
+
 # Libraries to link to while building
 LIBHDF5 = $(top_builddir)/src/libhdf5.la
 LIBH5TEST = $(top_builddir)/test/libh5test.la
@@ -670,7 +679,7 @@ test _test: $(PROGS) $(TESTS)
 	      fi;                                                             \
 	      echo "============================";                            \
 	      srcdir="$(srcdir)"                                              \
-	         $(RUNTEST) ./$$test $(TEST_FLAGS) ||                         \
+	         $(RUNTESTS) ./$$test $(TEST_FLAGS) ||                         \
 	         (test $$HDF5_Make_Ignore && echo "*** Error ignored") ||     \
 	         break;                                                       \
 	      echo "";                                                        \
diff --git a/tools/h5import/Makefile.in b/tools/h5import/Makefile.in
index 497bd11..8ebb489 100755
--- a/tools/h5import/Makefile.in
+++ b/tools/h5import/Makefile.in
@@ -99,18 +99,18 @@ ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 
-# Set the paths for autotools to be correct on heping.
+# Set the paths for AFS installs of autotools for Linux machines
 # Ideally, these tools should never be needed during the build.
-ACLOCAL = /usr/bin/aclocal
+ACLOCAL = /afs/ncsa/projects/hdf/packages/automake_1.9.5/Linux_2.4/bin/aclocal -I /afs/ncsa/projects/hdf/packages/libtool_1.5.14/Linux_2.4/share/aclocal
 ADD_PARALLEL_FILES = @ADD_PARALLEL_FILES@
 AMDEP_FALSE = @AMDEP_FALSE@
 AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AM_MAKEFLAGS = @AM_MAKEFLAGS@
 AR = @AR@
-AUTOCONF = /usr/local/autoconf-2.59/bin/autoconf
-AUTOHEADER = /usr/local/autoconf-2.59/bin/autoheader
-AUTOMAKE = /usr/bin/automake
+AUTOCONF = /afs/ncsa/projects/hdf/packages/autoconf_2.59/Linux_2.4/bin/autoconf
+AUTOHEADER = /afs/ncsa/projects/hdf/packages/autoconf_2.59/Linux_2.4/bin/autoheader
+AUTOMAKE = /afs/ncsa/projects/hdf/packages/automake_1.9.5/Linux_2.4/bin/automake
 AWK = @AWK@
 BUILD_CXX_CONDITIONAL_FALSE = @BUILD_CXX_CONDITIONAL_FALSE@
 BUILD_CXX_CONDITIONAL_TRUE = @BUILD_CXX_CONDITIONAL_TRUE@
@@ -281,6 +281,15 @@ target_alias = @target_alias@
 RM = rm -f
 CP = cp
 
+# Some machines need a command to run executables; this is that command
+# so that our tests will run.
+# We use RUNTESTS instead of RUNSERIAL directly because it may be that
+# some tests need to be run with a different command.  Older versions
+# of the makefiles used the command
+# $(LIBTOOL) --mode=execute
+# in some directories, for instance.
+RUNTESTS = $(RUNSERIAL)
+
 # Libraries to link to while building
 LIBHDF5 = $(top_builddir)/src/libhdf5.la
 LIBH5TEST = $(top_builddir)/test/libh5test.la
@@ -661,7 +670,7 @@ test _test: $(PROGS) $(TESTS)
 	      fi;                                                             \
 	      echo "============================";                            \
 	      srcdir="$(srcdir)"                                              \
-	         $(RUNTEST) ./$$test $(TEST_FLAGS) ||                         \
+	         $(RUNTESTS) ./$$test $(TEST_FLAGS) ||                         \
 	         (test $$HDF5_Make_Ignore && echo "*** Error ignored") ||     \
 	         break;                                                       \
 	      echo "";                                                        \
diff --git a/tools/h5jam/Makefile.in b/tools/h5jam/Makefile.in
index 0b234cd..1a8000a 100644
--- a/tools/h5jam/Makefile.in
+++ b/tools/h5jam/Makefile.in
@@ -94,18 +94,18 @@ ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 
-# Set the paths for autotools to be correct on heping.
+# Set the paths for AFS installs of autotools for Linux machines
 # Ideally, these tools should never be needed during the build.
-ACLOCAL = /usr/bin/aclocal
+ACLOCAL = /afs/ncsa/projects/hdf/packages/automake_1.9.5/Linux_2.4/bin/aclocal -I /afs/ncsa/projects/hdf/packages/libtool_1.5.14/Linux_2.4/share/aclocal
 ADD_PARALLEL_FILES = @ADD_PARALLEL_FILES@
 AMDEP_FALSE = @AMDEP_FALSE@
 AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AM_MAKEFLAGS = @AM_MAKEFLAGS@
 AR = @AR@
-AUTOCONF = /usr/local/autoconf-2.59/bin/autoconf
-AUTOHEADER = /usr/local/autoconf-2.59/bin/autoheader
-AUTOMAKE = /usr/bin/automake
+AUTOCONF = /afs/ncsa/projects/hdf/packages/autoconf_2.59/Linux_2.4/bin/autoconf
+AUTOHEADER = /afs/ncsa/projects/hdf/packages/autoconf_2.59/Linux_2.4/bin/autoheader
+AUTOMAKE = /afs/ncsa/projects/hdf/packages/automake_1.9.5/Linux_2.4/bin/automake
 AWK = @AWK@
 BUILD_CXX_CONDITIONAL_FALSE = @BUILD_CXX_CONDITIONAL_FALSE@
 BUILD_CXX_CONDITIONAL_TRUE = @BUILD_CXX_CONDITIONAL_TRUE@
@@ -276,6 +276,15 @@ target_alias = @target_alias@
 RM = rm -f
 CP = cp
 
+# Some machines need a command to run executables; this is that command
+# so that our tests will run.
+# We use RUNTESTS instead of RUNSERIAL directly because it may be that
+# some tests need to be run with a different command.  Older versions
+# of the makefiles used the command
+# $(LIBTOOL) --mode=execute
+# in some directories, for instance.
+RUNTESTS = $(RUNSERIAL)
+
 # Libraries to link to while building
 LIBHDF5 = $(top_builddir)/src/libhdf5.la
 LIBH5TEST = $(top_builddir)/test/libh5test.la
@@ -687,7 +696,7 @@ test _test: $(PROGS) $(TESTS)
 	      fi;                                                             \
 	      echo "============================";                            \
 	      srcdir="$(srcdir)"                                              \
-	         $(RUNTEST) ./$$test $(TEST_FLAGS) ||                         \
+	         $(RUNTESTS) ./$$test $(TEST_FLAGS) ||                         \
 	         (test $$HDF5_Make_Ignore && echo "*** Error ignored") ||     \
 	         break;                                                       \
 	      echo "";                                                        \
diff --git a/tools/h5ls/Makefile.in b/tools/h5ls/Makefile.in
index 1ce0784..1358f82 100644
--- a/tools/h5ls/Makefile.in
+++ b/tools/h5ls/Makefile.in
@@ -92,18 +92,18 @@ ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 
-# Set the paths for autotools to be correct on heping.
+# Set the paths for AFS installs of autotools for Linux machines
 # Ideally, these tools should never be needed during the build.
-ACLOCAL = /usr/bin/aclocal
+ACLOCAL = /afs/ncsa/projects/hdf/packages/automake_1.9.5/Linux_2.4/bin/aclocal -I /afs/ncsa/projects/hdf/packages/libtool_1.5.14/Linux_2.4/share/aclocal
 ADD_PARALLEL_FILES = @ADD_PARALLEL_FILES@
 AMDEP_FALSE = @AMDEP_FALSE@
 AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AM_MAKEFLAGS = @AM_MAKEFLAGS@
 AR = @AR@
-AUTOCONF = /usr/local/autoconf-2.59/bin/autoconf
-AUTOHEADER = /usr/local/autoconf-2.59/bin/autoheader
-AUTOMAKE = /usr/bin/automake
+AUTOCONF = /afs/ncsa/projects/hdf/packages/autoconf_2.59/Linux_2.4/bin/autoconf
+AUTOHEADER = /afs/ncsa/projects/hdf/packages/autoconf_2.59/Linux_2.4/bin/autoheader
+AUTOMAKE = /afs/ncsa/projects/hdf/packages/automake_1.9.5/Linux_2.4/bin/automake
 AWK = @AWK@
 BUILD_CXX_CONDITIONAL_FALSE = @BUILD_CXX_CONDITIONAL_FALSE@
 BUILD_CXX_CONDITIONAL_TRUE = @BUILD_CXX_CONDITIONAL_TRUE@
@@ -274,6 +274,15 @@ target_alias = @target_alias@
 RM = rm -f
 CP = cp
 
+# Some machines need a command to run executables; this is that command
+# so that our tests will run.
+# We use RUNTESTS instead of RUNSERIAL directly because it may be that
+# some tests need to be run with a different command.  Older versions
+# of the makefiles used the command
+# $(LIBTOOL) --mode=execute
+# in some directories, for instance.
+RUNTESTS = $(RUNSERIAL)
+
 # Libraries to link to while building
 LIBHDF5 = $(top_builddir)/src/libhdf5.la
 LIBH5TEST = $(top_builddir)/test/libh5test.la
@@ -641,7 +650,7 @@ test _test: $(PROGS) $(TESTS)
 	      fi;                                                             \
 	      echo "============================";                            \
 	      srcdir="$(srcdir)"                                              \
-	         $(RUNTEST) ./$$test $(TEST_FLAGS) ||                         \
+	         $(RUNTESTS) ./$$test $(TEST_FLAGS) ||                         \
 	         (test $$HDF5_Make_Ignore && echo "*** Error ignored") ||     \
 	         break;                                                       \
 	      echo "";                                                        \
diff --git a/tools/h5repack/Makefile.in b/tools/h5repack/Makefile.in
index 53ce416..44f9cbf 100644
--- a/tools/h5repack/Makefile.in
+++ b/tools/h5repack/Makefile.in
@@ -114,18 +114,18 @@ ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 
-# Set the paths for autotools to be correct on heping.
+# Set the paths for AFS installs of autotools for Linux machines
 # Ideally, these tools should never be needed during the build.
-ACLOCAL = /usr/bin/aclocal
+ACLOCAL = /afs/ncsa/projects/hdf/packages/automake_1.9.5/Linux_2.4/bin/aclocal -I /afs/ncsa/projects/hdf/packages/libtool_1.5.14/Linux_2.4/share/aclocal
 ADD_PARALLEL_FILES = @ADD_PARALLEL_FILES@
 AMDEP_FALSE = @AMDEP_FALSE@
 AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AM_MAKEFLAGS = @AM_MAKEFLAGS@
 AR = @AR@
-AUTOCONF = /usr/local/autoconf-2.59/bin/autoconf
-AUTOHEADER = /usr/local/autoconf-2.59/bin/autoheader
-AUTOMAKE = /usr/bin/automake
+AUTOCONF = /afs/ncsa/projects/hdf/packages/autoconf_2.59/Linux_2.4/bin/autoconf
+AUTOHEADER = /afs/ncsa/projects/hdf/packages/autoconf_2.59/Linux_2.4/bin/autoheader
+AUTOMAKE = /afs/ncsa/projects/hdf/packages/automake_1.9.5/Linux_2.4/bin/automake
 AWK = @AWK@
 BUILD_CXX_CONDITIONAL_FALSE = @BUILD_CXX_CONDITIONAL_FALSE@
 BUILD_CXX_CONDITIONAL_TRUE = @BUILD_CXX_CONDITIONAL_TRUE@
@@ -296,6 +296,15 @@ target_alias = @target_alias@
 RM = rm -f
 CP = cp
 
+# Some machines need a command to run executables; this is that command
+# so that our tests will run.
+# We use RUNTESTS instead of RUNSERIAL directly because it may be that
+# some tests need to be run with a different command.  Older versions
+# of the makefiles used the command
+# $(LIBTOOL) --mode=execute
+# in some directories, for instance.
+RUNTESTS = $(RUNSERIAL)
+
 # Libraries to link to while building
 LIBHDF5 = $(top_builddir)/src/libhdf5.la
 LIBH5TEST = $(top_builddir)/test/libh5test.la
@@ -720,7 +729,7 @@ test _test: $(PROGS) $(TESTS)
 	      fi;                                                             \
 	      echo "============================";                            \
 	      srcdir="$(srcdir)"                                              \
-	         $(RUNTEST) ./$$test $(TEST_FLAGS) ||                         \
+	         $(RUNTESTS) ./$$test $(TEST_FLAGS) ||                         \
 	         (test $$HDF5_Make_Ignore && echo "*** Error ignored") ||     \
 	         break;                                                       \
 	      echo "";                                                        \
diff --git a/tools/lib/Makefile.in b/tools/lib/Makefile.in
index 9557701..bd6239f 100644
--- a/tools/lib/Makefile.in
+++ b/tools/lib/Makefile.in
@@ -96,18 +96,18 @@ ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 
-# Set the paths for autotools to be correct on heping.
+# Set the paths for AFS installs of autotools for Linux machines
 # Ideally, these tools should never be needed during the build.
-ACLOCAL = /usr/bin/aclocal
+ACLOCAL = /afs/ncsa/projects/hdf/packages/automake_1.9.5/Linux_2.4/bin/aclocal -I /afs/ncsa/projects/hdf/packages/libtool_1.5.14/Linux_2.4/share/aclocal
 ADD_PARALLEL_FILES = @ADD_PARALLEL_FILES@
 AMDEP_FALSE = @AMDEP_FALSE@
 AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AM_MAKEFLAGS = @AM_MAKEFLAGS@
 AR = @AR@
-AUTOCONF = /usr/local/autoconf-2.59/bin/autoconf
-AUTOHEADER = /usr/local/autoconf-2.59/bin/autoheader
-AUTOMAKE = /usr/bin/automake
+AUTOCONF = /afs/ncsa/projects/hdf/packages/autoconf_2.59/Linux_2.4/bin/autoconf
+AUTOHEADER = /afs/ncsa/projects/hdf/packages/autoconf_2.59/Linux_2.4/bin/autoheader
+AUTOMAKE = /afs/ncsa/projects/hdf/packages/automake_1.9.5/Linux_2.4/bin/automake
 AWK = @AWK@
 BUILD_CXX_CONDITIONAL_FALSE = @BUILD_CXX_CONDITIONAL_FALSE@
 BUILD_CXX_CONDITIONAL_TRUE = @BUILD_CXX_CONDITIONAL_TRUE@
@@ -278,6 +278,15 @@ target_alias = @target_alias@
 RM = rm -f
 CP = cp
 
+# Some machines need a command to run executables; this is that command
+# so that our tests will run.
+# We use RUNTESTS instead of RUNSERIAL directly because it may be that
+# some tests need to be run with a different command.  Older versions
+# of the makefiles used the command
+# $(LIBTOOL) --mode=execute
+# in some directories, for instance.
+RUNTESTS = $(RUNSERIAL)
+
 # Libraries to link to while building
 LIBHDF5 = $(top_builddir)/src/libhdf5.la
 LIBH5TEST = $(top_builddir)/test/libh5test.la
@@ -658,7 +667,7 @@ test _test: $(PROGS) $(TESTS)
 	      fi;                                                             \
 	      echo "============================";                            \
 	      srcdir="$(srcdir)"                                              \
-	         $(RUNTEST) ./$$test $(TEST_FLAGS) ||                         \
+	         $(RUNTESTS) ./$$test $(TEST_FLAGS) ||                         \
 	         (test $$HDF5_Make_Ignore && echo "*** Error ignored") ||     \
 	         break;                                                       \
 	      echo "";                                                        \
diff --git a/tools/misc/Makefile.in b/tools/misc/Makefile.in
index 23016ab..4ea6bd1 100644
--- a/tools/misc/Makefile.in
+++ b/tools/misc/Makefile.in
@@ -104,18 +104,18 @@ ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 
-# Set the paths for autotools to be correct on heping.
+# Set the paths for AFS installs of autotools for Linux machines
 # Ideally, these tools should never be needed during the build.
-ACLOCAL = /usr/bin/aclocal
+ACLOCAL = /afs/ncsa/projects/hdf/packages/automake_1.9.5/Linux_2.4/bin/aclocal -I /afs/ncsa/projects/hdf/packages/libtool_1.5.14/Linux_2.4/share/aclocal
 ADD_PARALLEL_FILES = @ADD_PARALLEL_FILES@
 AMDEP_FALSE = @AMDEP_FALSE@
 AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AM_MAKEFLAGS = @AM_MAKEFLAGS@
 AR = @AR@
-AUTOCONF = /usr/local/autoconf-2.59/bin/autoconf
-AUTOHEADER = /usr/local/autoconf-2.59/bin/autoheader
-AUTOMAKE = /usr/bin/automake
+AUTOCONF = /afs/ncsa/projects/hdf/packages/autoconf_2.59/Linux_2.4/bin/autoconf
+AUTOHEADER = /afs/ncsa/projects/hdf/packages/autoconf_2.59/Linux_2.4/bin/autoheader
+AUTOMAKE = /afs/ncsa/projects/hdf/packages/automake_1.9.5/Linux_2.4/bin/automake
 AWK = @AWK@
 BUILD_CXX_CONDITIONAL_FALSE = @BUILD_CXX_CONDITIONAL_FALSE@
 BUILD_CXX_CONDITIONAL_TRUE = @BUILD_CXX_CONDITIONAL_TRUE@
@@ -286,6 +286,15 @@ target_alias = @target_alias@
 RM = rm -f
 CP = cp
 
+# Some machines need a command to run executables; this is that command
+# so that our tests will run.
+# We use RUNTESTS instead of RUNSERIAL directly because it may be that
+# some tests need to be run with a different command.  Older versions
+# of the makefiles used the command
+# $(LIBTOOL) --mode=execute
+# in some directories, for instance.
+RUNTESTS = $(RUNSERIAL)
+
 # Libraries to link to while building
 LIBHDF5 = $(top_builddir)/src/libhdf5.la
 LIBH5TEST = $(top_builddir)/test/libh5test.la
@@ -706,7 +715,7 @@ test _test: $(PROGS) $(TESTS)
 	      fi;                                                             \
 	      echo "============================";                            \
 	      srcdir="$(srcdir)"                                              \
-	         $(RUNTEST) ./$$test $(TEST_FLAGS) ||                         \
+	         $(RUNTESTS) ./$$test $(TEST_FLAGS) ||                         \
 	         (test $$HDF5_Make_Ignore && echo "*** Error ignored") ||     \
 	         break;                                                       \
 	      echo "";                                                        \