[svn-r9915] Purpose:

Bug fix

Description:
Configuration files' timestamps were incorrect.

Solution:
Update Makefiles.in.  Also added correct paths to autotools on heping,
so heping build should be able to re-generate configuration files even
if they are still broken.

Platforms tested:
sleipnir

47 files changed, 282 insertions, 282 deletions

diff --git a/Makefile.in b/Makefile.in
index 56d3354..1fdf8c5 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -89,12 +89,12 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 includedir = $(exec_prefix)/include
 
 
-# Prevent automake from trying to run autotools during build
-# Temporary fix (I hope!) - JAMES
-ACLOCAL = 
-AUTOCONF = 
-AUTOMAKE = 
-AUTOHEADER = 
+# Set the paths for autotools to be correct on heping.
+# Ideally, these tools should never be needed during the build.
+ACLOCAL = /usr/bin/aclocal
+AUTOCONF = /usr/local/autoconf-2.59/bin/autoconf
+AUTOMAKE = /usr/bin/automake
+AUTOHEADER = /usr/local/autoconf-2.59/bin/autoheader
 ADD_PARALLEL_FILES = @ADD_PARALLEL_FILES@
 AMTAR = @AMTAR@
 AR = @AR@
diff --git a/c++/Makefile.in b/c++/Makefile.in
index 33879b2..614e5a9 100644
--- a/c++/Makefile.in
+++ b/c++/Makefile.in
@@ -92,12 +92,12 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 includedir = $(exec_prefix)/include
 
 
-# Prevent automake from trying to run autotools during build
-# Temporary fix (I hope!) - JAMES
-ACLOCAL = 
-AUTOCONF = 
-AUTOMAKE = 
-AUTOHEADER = 
+# Set the paths for autotools to be correct on heping.
+# Ideally, these tools should never be needed during the build.
+ACLOCAL = /usr/bin/aclocal
+AUTOCONF = /usr/local/autoconf-2.59/bin/autoconf
+AUTOMAKE = /usr/bin/automake
+AUTOHEADER = /usr/local/autoconf-2.59/bin/autoheader
 ADD_PARALLEL_FILES = @ADD_PARALLEL_FILES@
 AMTAR = @AMTAR@
 AR = @AR@
diff --git a/c++/examples/Makefile.in b/c++/examples/Makefile.in
index 7662896..5cf06a3 100644
--- a/c++/examples/Makefile.in
+++ b/c++/examples/Makefile.in
@@ -92,12 +92,12 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 includedir = $(exec_prefix)/include
 
 
-# Prevent automake from trying to run autotools during build
-# Temporary fix (I hope!) - JAMES
-ACLOCAL = 
-AUTOCONF = 
-AUTOMAKE = 
-AUTOHEADER = 
+# Set the paths for autotools to be correct on heping.
+# Ideally, these tools should never be needed during the build.
+ACLOCAL = /usr/bin/aclocal
+AUTOCONF = /usr/local/autoconf-2.59/bin/autoconf
+AUTOMAKE = /usr/bin/automake
+AUTOHEADER = /usr/local/autoconf-2.59/bin/autoheader
 ADD_PARALLEL_FILES = @ADD_PARALLEL_FILES@
 AMTAR = @AMTAR@
 AR = @AR@
diff --git a/c++/src/Makefile.in b/c++/src/Makefile.in
index 6a30ed2..9f26046 100644
--- a/c++/src/Makefile.in
+++ b/c++/src/Makefile.in
@@ -92,12 +92,12 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 includedir = $(exec_prefix)/include
 
 
-# Prevent automake from trying to run autotools during build
-# Temporary fix (I hope!) - JAMES
-ACLOCAL = 
-AUTOCONF = 
-AUTOMAKE = 
-AUTOHEADER = 
+# Set the paths for autotools to be correct on heping.
+# Ideally, these tools should never be needed during the build.
+ACLOCAL = /usr/bin/aclocal
+AUTOCONF = /usr/local/autoconf-2.59/bin/autoconf
+AUTOMAKE = /usr/bin/automake
+AUTOHEADER = /usr/local/autoconf-2.59/bin/autoheader
 ADD_PARALLEL_FILES = @ADD_PARALLEL_FILES@
 AMTAR = @AMTAR@
 AR = @AR@
diff --git a/c++/test/Makefile.in b/c++/test/Makefile.in
index 639112e..5aeb927 100644
--- a/c++/test/Makefile.in
+++ b/c++/test/Makefile.in
@@ -92,12 +92,12 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 includedir = $(exec_prefix)/include
 
 
-# Prevent automake from trying to run autotools during build
-# Temporary fix (I hope!) - JAMES
-ACLOCAL = 
-AUTOCONF = 
-AUTOMAKE = 
-AUTOHEADER = 
+# Set the paths for autotools to be correct on heping.
+# Ideally, these tools should never be needed during the build.
+ACLOCAL = /usr/bin/aclocal
+AUTOCONF = /usr/local/autoconf-2.59/bin/autoconf
+AUTOMAKE = /usr/bin/automake
+AUTOHEADER = /usr/local/autoconf-2.59/bin/autoheader
 ADD_PARALLEL_FILES = @ADD_PARALLEL_FILES@
 AMTAR = @AMTAR@
 AR = @AR@
diff --git a/config/commence.am b/config/commence.am
index 2317b97..5c8339c 100644
--- a/config/commence.am
+++ b/config/commence.am
@@ -32,9 +32,9 @@ H5FC_PP=$(bindir)/h5pfc
 F9XMODEXT=@F9XMODEXT@
 F9XMODFLAG=@F9XMODFLAG@
 
-# Prevent automake from trying to run autotools during build
-# Temporary fix (I hope!) - JAMES
-ACLOCAL=
-AUTOCONF=
-AUTOMAKE=
-AUTOHEADER=
+# Set the paths for autotools to be correct on heping.
+# Ideally, these tools should never be needed during the build.
+ACLOCAL=/usr/bin/aclocal
+AUTOCONF=/usr/local/autoconf-2.59/bin/autoconf
+AUTOMAKE=/usr/bin/automake
+AUTOHEADER=/usr/local/autoconf-2.59/bin/autoheader
diff --git a/doc/Makefile.in b/doc/Makefile.in
index 8cb81fc..975aded 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -82,12 +82,12 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 includedir = $(exec_prefix)/include
 
 
-# Prevent automake from trying to run autotools during build
-# Temporary fix (I hope!) - JAMES
-ACLOCAL = 
-AUTOCONF = 
-AUTOMAKE = 
-AUTOHEADER = 
+# Set the paths for autotools to be correct on heping.
+# Ideally, these tools should never be needed during the build.
+ACLOCAL = /usr/bin/aclocal
+AUTOCONF = /usr/local/autoconf-2.59/bin/autoconf
+AUTOMAKE = /usr/bin/automake
+AUTOHEADER = /usr/local/autoconf-2.59/bin/autoheader
 ADD_PARALLEL_FILES = @ADD_PARALLEL_FILES@
 AMTAR = @AMTAR@
 AR = @AR@
diff --git a/doc/html/ADGuide/Makefile.in b/doc/html/ADGuide/Makefile.in
index dcd2c5f..f4d7aa1 100644
--- a/doc/html/ADGuide/Makefile.in
+++ b/doc/html/ADGuide/Makefile.in
@@ -78,12 +78,12 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 includedir = $(exec_prefix)/include
 
 
-# Prevent automake from trying to run autotools during build
-# Temporary fix (I hope!) - JAMES
-ACLOCAL = 
-AUTOCONF = 
-AUTOMAKE = 
-AUTOHEADER = 
+# Set the paths for autotools to be correct on heping.
+# Ideally, these tools should never be needed during the build.
+ACLOCAL = /usr/bin/aclocal
+AUTOCONF = /usr/local/autoconf-2.59/bin/autoconf
+AUTOMAKE = /usr/bin/automake
+AUTOHEADER = /usr/local/autoconf-2.59/bin/autoheader
 ADD_PARALLEL_FILES = @ADD_PARALLEL_FILES@
 AMTAR = @AMTAR@
 AR = @AR@
diff --git a/doc/html/Graphics/Makefile.in b/doc/html/Graphics/Makefile.in
index f01259d..c17cae0 100644
--- a/doc/html/Graphics/Makefile.in
+++ b/doc/html/Graphics/Makefile.in
@@ -78,12 +78,12 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 includedir = $(exec_prefix)/include
 
 
-# Prevent automake from trying to run autotools during build
-# Temporary fix (I hope!) - JAMES
-ACLOCAL = 
-AUTOCONF = 
-AUTOMAKE = 
-AUTOHEADER = 
+# Set the paths for autotools to be correct on heping.
+# Ideally, these tools should never be needed during the build.
+ACLOCAL = /usr/bin/aclocal
+AUTOCONF = /usr/local/autoconf-2.59/bin/autoconf
+AUTOMAKE = /usr/bin/automake
+AUTOHEADER = /usr/local/autoconf-2.59/bin/autoheader
 ADD_PARALLEL_FILES = @ADD_PARALLEL_FILES@
 AMTAR = @AMTAR@
 AR = @AR@
diff --git a/doc/html/Intro/Makefile.in b/doc/html/Intro/Makefile.in
index 1ef50d2..bc349ab 100644
--- a/doc/html/Intro/Makefile.in
+++ b/doc/html/Intro/Makefile.in
@@ -78,12 +78,12 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 includedir = $(exec_prefix)/include
 
 
-# Prevent automake from trying to run autotools during build
-# Temporary fix (I hope!) - JAMES
-ACLOCAL = 
-AUTOCONF = 
-AUTOMAKE = 
-AUTOHEADER = 
+# Set the paths for autotools to be correct on heping.
+# Ideally, these tools should never be needed during the build.
+ACLOCAL = /usr/bin/aclocal
+AUTOCONF = /usr/local/autoconf-2.59/bin/autoconf
+AUTOMAKE = /usr/bin/automake
+AUTOHEADER = /usr/local/autoconf-2.59/bin/autoheader
 ADD_PARALLEL_FILES = @ADD_PARALLEL_FILES@
 AMTAR = @AMTAR@
 AR = @AR@
diff --git a/doc/html/Makefile.in b/doc/html/Makefile.in
index 7eff220..a594888 100644
--- a/doc/html/Makefile.in
+++ b/doc/html/Makefile.in
@@ -82,12 +82,12 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 includedir = $(exec_prefix)/include
 
 
-# Prevent automake from trying to run autotools during build
-# Temporary fix (I hope!) - JAMES
-ACLOCAL = 
-AUTOCONF = 
-AUTOMAKE = 
-AUTOHEADER = 
+# Set the paths for autotools to be correct on heping.
+# Ideally, these tools should never be needed during the build.
+ACLOCAL = /usr/bin/aclocal
+AUTOCONF = /usr/local/autoconf-2.59/bin/autoconf
+AUTOMAKE = /usr/bin/automake
+AUTOHEADER = /usr/local/autoconf-2.59/bin/autoheader
 ADD_PARALLEL_FILES = @ADD_PARALLEL_FILES@
 AMTAR = @AMTAR@
 AR = @AR@
diff --git a/doc/html/PSandPDF/Makefile.in b/doc/html/PSandPDF/Makefile.in
index 02f0169..c596abd 100644
--- a/doc/html/PSandPDF/Makefile.in
+++ b/doc/html/PSandPDF/Makefile.in
@@ -78,12 +78,12 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 includedir = $(exec_prefix)/include
 
 
-# Prevent automake from trying to run autotools during build
-# Temporary fix (I hope!) - JAMES
-ACLOCAL = 
-AUTOCONF = 
-AUTOMAKE = 
-AUTOHEADER = 
+# Set the paths for autotools to be correct on heping.
+# Ideally, these tools should never be needed during the build.
+ACLOCAL = /usr/bin/aclocal
+AUTOCONF = /usr/local/autoconf-2.59/bin/autoconf
+AUTOMAKE = /usr/bin/automake
+AUTOHEADER = /usr/local/autoconf-2.59/bin/autoheader
 ADD_PARALLEL_FILES = @ADD_PARALLEL_FILES@
 AMTAR = @AMTAR@
 AR = @AR@
diff --git a/doc/html/TechNotes/Makefile.in b/doc/html/TechNotes/Makefile.in
index a299e12..3180c6c 100644
--- a/doc/html/TechNotes/Makefile.in
+++ b/doc/html/TechNotes/Makefile.in
@@ -78,12 +78,12 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 includedir = $(exec_prefix)/include
 
 
-# Prevent automake from trying to run autotools during build
-# Temporary fix (I hope!) - JAMES
-ACLOCAL = 
-AUTOCONF = 
-AUTOMAKE = 
-AUTOHEADER = 
+# Set the paths for autotools to be correct on heping.
+# Ideally, these tools should never be needed during the build.
+ACLOCAL = /usr/bin/aclocal
+AUTOCONF = /usr/local/autoconf-2.59/bin/autoconf
+AUTOMAKE = /usr/bin/automake
+AUTOHEADER = /usr/local/autoconf-2.59/bin/autoheader
 ADD_PARALLEL_FILES = @ADD_PARALLEL_FILES@
 AMTAR = @AMTAR@
 AR = @AR@
diff --git a/doc/html/Tutor/Graphics/Makefile.in b/doc/html/Tutor/Graphics/Makefile.in
index edc0617..686739a 100644
--- a/doc/html/Tutor/Graphics/Makefile.in
+++ b/doc/html/Tutor/Graphics/Makefile.in
@@ -78,12 +78,12 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 includedir = $(exec_prefix)/include
 
 
-# Prevent automake from trying to run autotools during build
-# Temporary fix (I hope!) - JAMES
-ACLOCAL = 
-AUTOCONF = 
-AUTOMAKE = 
-AUTOHEADER = 
+# Set the paths for autotools to be correct on heping.
+# Ideally, these tools should never be needed during the build.
+ACLOCAL = /usr/bin/aclocal
+AUTOCONF = /usr/local/autoconf-2.59/bin/autoconf
+AUTOMAKE = /usr/bin/automake
+AUTOHEADER = /usr/local/autoconf-2.59/bin/autoheader
 ADD_PARALLEL_FILES = @ADD_PARALLEL_FILES@
 AMTAR = @AMTAR@
 AR = @AR@
diff --git a/doc/html/Tutor/Makefile.in b/doc/html/Tutor/Makefile.in
index f519656..a643b5f 100644
--- a/doc/html/Tutor/Makefile.in
+++ b/doc/html/Tutor/Makefile.in
@@ -78,12 +78,12 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 includedir = $(exec_prefix)/include
 
 
-# Prevent automake from trying to run autotools during build
-# Temporary fix (I hope!) - JAMES
-ACLOCAL = 
-AUTOCONF = 
-AUTOMAKE = 
-AUTOHEADER = 
+# Set the paths for autotools to be correct on heping.
+# Ideally, these tools should never be needed during the build.
+ACLOCAL = /usr/bin/aclocal
+AUTOCONF = /usr/local/autoconf-2.59/bin/autoconf
+AUTOMAKE = /usr/bin/automake
+AUTOHEADER = /usr/local/autoconf-2.59/bin/autoheader
 ADD_PARALLEL_FILES = @ADD_PARALLEL_FILES@
 AMTAR = @AMTAR@
 AR = @AR@
diff --git a/doc/html/Tutor/examples/Makefile.in b/doc/html/Tutor/examples/Makefile.in
index 5100004..50b85ba 100644
--- a/doc/html/Tutor/examples/Makefile.in
+++ b/doc/html/Tutor/examples/Makefile.in
@@ -78,12 +78,12 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 includedir = $(exec_prefix)/include
 
 
-# Prevent automake from trying to run autotools during build
-# Temporary fix (I hope!) - JAMES
-ACLOCAL = 
-AUTOCONF = 
-AUTOMAKE = 
-AUTOHEADER = 
+# Set the paths for autotools to be correct on heping.
+# Ideally, these tools should never be needed during the build.
+ACLOCAL = /usr/bin/aclocal
+AUTOCONF = /usr/local/autoconf-2.59/bin/autoconf
+AUTOMAKE = /usr/bin/automake
+AUTOHEADER = /usr/local/autoconf-2.59/bin/autoheader
 ADD_PARALLEL_FILES = @ADD_PARALLEL_FILES@
 AMTAR = @AMTAR@
 AR = @AR@
diff --git a/doc/html/cpplus/Makefile.in b/doc/html/cpplus/Makefile.in
index 9a58c44..fd156b6 100644
--- a/doc/html/cpplus/Makefile.in
+++ b/doc/html/cpplus/Makefile.in
@@ -78,12 +78,12 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 includedir = $(exec_prefix)/include
 
 
-# Prevent automake from trying to run autotools during build
-# Temporary fix (I hope!) - JAMES
-ACLOCAL = 
-AUTOCONF = 
-AUTOMAKE = 
-AUTOHEADER = 
+# Set the paths for autotools to be correct on heping.
+# Ideally, these tools should never be needed during the build.
+ACLOCAL = /usr/bin/aclocal
+AUTOCONF = /usr/local/autoconf-2.59/bin/autoconf
+AUTOMAKE = /usr/bin/automake
+AUTOHEADER = /usr/local/autoconf-2.59/bin/autoheader
 ADD_PARALLEL_FILES = @ADD_PARALLEL_FILES@
 AMTAR = @AMTAR@
 AR = @AR@
diff --git a/doc/html/ed_libs/Makefile.in b/doc/html/ed_libs/Makefile.in
index d41b243..9cd079d 100644
--- a/doc/html/ed_libs/Makefile.in
+++ b/doc/html/ed_libs/Makefile.in
@@ -78,12 +78,12 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 includedir = $(exec_prefix)/include
 
 
-# Prevent automake from trying to run autotools during build
-# Temporary fix (I hope!) - JAMES
-ACLOCAL = 
-AUTOCONF = 
-AUTOMAKE = 
-AUTOHEADER = 
+# Set the paths for autotools to be correct on heping.
+# Ideally, these tools should never be needed during the build.
+ACLOCAL = /usr/bin/aclocal
+AUTOCONF = /usr/local/autoconf-2.59/bin/autoconf
+AUTOMAKE = /usr/bin/automake
+AUTOHEADER = /usr/local/autoconf-2.59/bin/autoheader
 ADD_PARALLEL_FILES = @ADD_PARALLEL_FILES@
 AMTAR = @AMTAR@
 AR = @AR@
diff --git a/doc/html/ed_styles/Makefile.in b/doc/html/ed_styles/Makefile.in
index f29aed6..8163b06 100644
--- a/doc/html/ed_styles/Makefile.in
+++ b/doc/html/ed_styles/Makefile.in
@@ -78,12 +78,12 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 includedir = $(exec_prefix)/include
 
 
-# Prevent automake from trying to run autotools during build
-# Temporary fix (I hope!) - JAMES
-ACLOCAL = 
-AUTOCONF = 
-AUTOMAKE = 
-AUTOHEADER = 
+# Set the paths for autotools to be correct on heping.
+# Ideally, these tools should never be needed during the build.
+ACLOCAL = /usr/bin/aclocal
+AUTOCONF = /usr/local/autoconf-2.59/bin/autoconf
+AUTOMAKE = /usr/bin/automake
+AUTOHEADER = /usr/local/autoconf-2.59/bin/autoheader
 ADD_PARALLEL_FILES = @ADD_PARALLEL_FILES@
 AMTAR = @AMTAR@
 AR = @AR@
diff --git a/doc/html/fortran/Makefile.in b/doc/html/fortran/Makefile.in
index 593b32c..d9807d5 100644
--- a/doc/html/fortran/Makefile.in
+++ b/doc/html/fortran/Makefile.in
@@ -78,12 +78,12 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 includedir = $(exec_prefix)/include
 
 
-# Prevent automake from trying to run autotools during build
-# Temporary fix (I hope!) - JAMES
-ACLOCAL = 
-AUTOCONF = 
-AUTOMAKE = 
-AUTOHEADER = 
+# Set the paths for autotools to be correct on heping.
+# Ideally, these tools should never be needed during the build.
+ACLOCAL = /usr/bin/aclocal
+AUTOCONF = /usr/local/autoconf-2.59/bin/autoconf
+AUTOMAKE = /usr/bin/automake
+AUTOHEADER = /usr/local/autoconf-2.59/bin/autoheader
 ADD_PARALLEL_FILES = @ADD_PARALLEL_FILES@
 AMTAR = @AMTAR@
 AR = @AR@
diff --git a/examples/Makefile.in b/examples/Makefile.in
index 73315ed..16e0e1e 100644
--- a/examples/Makefile.in
+++ b/examples/Makefile.in
@@ -92,12 +92,12 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 includedir = $(exec_prefix)/include
 
 
-# Prevent automake from trying to run autotools during build
-# Temporary fix (I hope!) - JAMES
-ACLOCAL = 
-AUTOCONF = 
-AUTOMAKE = 
-AUTOHEADER = 
+# Set the paths for autotools to be correct on heping.
+# Ideally, these tools should never be needed during the build.
+ACLOCAL = /usr/bin/aclocal
+AUTOCONF = /usr/local/autoconf-2.59/bin/autoconf
+AUTOMAKE = /usr/bin/automake
+AUTOHEADER = /usr/local/autoconf-2.59/bin/autoheader
 ADD_PARALLEL_FILES = @ADD_PARALLEL_FILES@
 AMTAR = @AMTAR@
 AR = @AR@
diff --git a/fortran/Makefile.in b/fortran/Makefile.in
index 808692e..ee66ac9 100644
--- a/fortran/Makefile.in
+++ b/fortran/Makefile.in
@@ -96,12 +96,12 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 includedir = $(exec_prefix)/include
 
 
-# Prevent automake from trying to run autotools during build
-# Temporary fix (I hope!) - JAMES
-ACLOCAL = 
-AUTOCONF = 
-AUTOMAKE = 
-AUTOHEADER = 
+# Set the paths for autotools to be correct on heping.
+# Ideally, these tools should never be needed during the build.
+ACLOCAL = /usr/bin/aclocal
+AUTOCONF = /usr/local/autoconf-2.59/bin/autoconf
+AUTOMAKE = /usr/bin/automake
+AUTOHEADER = /usr/local/autoconf-2.59/bin/autoheader
 ADD_PARALLEL_FILES = @ADD_PARALLEL_FILES@
 AMTAR = @AMTAR@
 AR = @AR@
diff --git a/fortran/examples/Makefile.in b/fortran/examples/Makefile.in
index f7802f5..8f45f4c 100644
--- a/fortran/examples/Makefile.in
+++ b/fortran/examples/Makefile.in
@@ -92,12 +92,12 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 includedir = $(exec_prefix)/include
 
 
-# Prevent automake from trying to run autotools during build
-# Temporary fix (I hope!) - JAMES
-ACLOCAL = 
-AUTOCONF = 
-AUTOMAKE = 
-AUTOHEADER = 
+# Set the paths for autotools to be correct on heping.
+# Ideally, these tools should never be needed during the build.
+ACLOCAL = /usr/bin/aclocal
+AUTOCONF = /usr/local/autoconf-2.59/bin/autoconf
+AUTOMAKE = /usr/bin/automake
+AUTOHEADER = /usr/local/autoconf-2.59/bin/autoheader
 ADD_PARALLEL_FILES = @ADD_PARALLEL_FILES@
 AMTAR = @AMTAR@
 AR = @AR@
diff --git a/fortran/src/Makefile.in b/fortran/src/Makefile.in
index 145b11d..fb4d195 100644
--- a/fortran/src/Makefile.in
+++ b/fortran/src/Makefile.in
@@ -92,12 +92,12 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 includedir = $(exec_prefix)/include
 
 
-# Prevent automake from trying to run autotools during build
-# Temporary fix (I hope!) - JAMES
-ACLOCAL = 
-AUTOCONF = 
-AUTOMAKE = 
-AUTOHEADER = 
+# Set the paths for autotools to be correct on heping.
+# Ideally, these tools should never be needed during the build.
+ACLOCAL = /usr/bin/aclocal
+AUTOCONF = /usr/local/autoconf-2.59/bin/autoconf
+AUTOMAKE = /usr/bin/automake
+AUTOHEADER = /usr/local/autoconf-2.59/bin/autoheader
 ADD_PARALLEL_FILES = @ADD_PARALLEL_FILES@
 AMTAR = @AMTAR@
 AR = @AR@
diff --git a/fortran/test/Makefile.in b/fortran/test/Makefile.in
index 1797877..2a000d3 100644
--- a/fortran/test/Makefile.in
+++ b/fortran/test/Makefile.in
@@ -92,12 +92,12 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 includedir = $(exec_prefix)/include
 
 
-# Prevent automake from trying to run autotools during build
-# Temporary fix (I hope!) - JAMES
-ACLOCAL = 
-AUTOCONF = 
-AUTOMAKE = 
-AUTOHEADER = 
+# Set the paths for autotools to be correct on heping.
+# Ideally, these tools should never be needed during the build.
+ACLOCAL = /usr/bin/aclocal
+AUTOCONF = /usr/local/autoconf-2.59/bin/autoconf
+AUTOMAKE = /usr/bin/automake
+AUTOHEADER = /usr/local/autoconf-2.59/bin/autoheader
 ADD_PARALLEL_FILES = @ADD_PARALLEL_FILES@
 AMTAR = @AMTAR@
 AR = @AR@
diff --git a/fortran/testpar/Makefile.in b/fortran/testpar/Makefile.in
index e1e731e..778bd61 100644
--- a/fortran/testpar/Makefile.in
+++ b/fortran/testpar/Makefile.in
@@ -92,12 +92,12 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 includedir = $(exec_prefix)/include
 
 
-# Prevent automake from trying to run autotools during build
-# Temporary fix (I hope!) - JAMES
-ACLOCAL = 
-AUTOCONF = 
-AUTOMAKE = 
-AUTOHEADER = 
+# Set the paths for autotools to be correct on heping.
+# Ideally, these tools should never be needed during the build.
+ACLOCAL = /usr/bin/aclocal
+AUTOCONF = /usr/local/autoconf-2.59/bin/autoconf
+AUTOMAKE = /usr/bin/automake
+AUTOHEADER = /usr/local/autoconf-2.59/bin/autoheader
 ADD_PARALLEL_FILES = @ADD_PARALLEL_FILES@
 AMTAR = @AMTAR@
 AR = @AR@
diff --git a/hl/Makefile.in b/hl/Makefile.in
index f264f6d..dad0616 100755
--- a/hl/Makefile.in
+++ b/hl/Makefile.in
@@ -87,12 +87,12 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 includedir = $(exec_prefix)/include
 
 
-# Prevent automake from trying to run autotools during build
-# Temporary fix (I hope!) - JAMES
-ACLOCAL = 
-AUTOCONF = 
-AUTOMAKE = 
-AUTOHEADER = 
+# Set the paths for autotools to be correct on heping.
+# Ideally, these tools should never be needed during the build.
+ACLOCAL = /usr/bin/aclocal
+AUTOCONF = /usr/local/autoconf-2.59/bin/autoconf
+AUTOMAKE = /usr/bin/automake
+AUTOHEADER = /usr/local/autoconf-2.59/bin/autoheader
 ADD_PARALLEL_FILES = @ADD_PARALLEL_FILES@
 AMTAR = @AMTAR@
 AR = @AR@
diff --git a/hl/fortran/Makefile.in b/hl/fortran/Makefile.in
index d99547a..7218b14 100644
--- a/hl/fortran/Makefile.in
+++ b/hl/fortran/Makefile.in
@@ -87,12 +87,12 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 includedir = $(exec_prefix)/include
 
 
-# Prevent automake from trying to run autotools during build
-# Temporary fix (I hope!) - JAMES
-ACLOCAL = 
-AUTOCONF = 
-AUTOMAKE = 
-AUTOHEADER = 
+# Set the paths for autotools to be correct on heping.
+# Ideally, these tools should never be needed during the build.
+ACLOCAL = /usr/bin/aclocal
+AUTOCONF = /usr/local/autoconf-2.59/bin/autoconf
+AUTOMAKE = /usr/bin/automake
+AUTOHEADER = /usr/local/autoconf-2.59/bin/autoheader
 ADD_PARALLEL_FILES = @ADD_PARALLEL_FILES@
 AMTAR = @AMTAR@
 AR = @AR@
diff --git a/hl/fortran/src/Makefile.in b/hl/fortran/src/Makefile.in
index f2e956a..dcea3fe 100644
--- a/hl/fortran/src/Makefile.in
+++ b/hl/fortran/src/Makefile.in
@@ -83,12 +83,12 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 includedir = $(exec_prefix)/include
 
 
-# Prevent automake from trying to run autotools during build
-# Temporary fix (I hope!) - JAMES
-ACLOCAL = 
-AUTOCONF = 
-AUTOMAKE = 
-AUTOHEADER = 
+# Set the paths for autotools to be correct on heping.
+# Ideally, these tools should never be needed during the build.
+ACLOCAL = /usr/bin/aclocal
+AUTOCONF = /usr/local/autoconf-2.59/bin/autoconf
+AUTOMAKE = /usr/bin/automake
+AUTOHEADER = /usr/local/autoconf-2.59/bin/autoheader
 ADD_PARALLEL_FILES = @ADD_PARALLEL_FILES@
 AMTAR = @AMTAR@
 AR = @AR@
diff --git a/hl/fortran/test/Makefile.in b/hl/fortran/test/Makefile.in
index 5115955..3cdf03d 100644
--- a/hl/fortran/test/Makefile.in
+++ b/hl/fortran/test/Makefile.in
@@ -83,12 +83,12 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 includedir = $(exec_prefix)/include
 
 
-# Prevent automake from trying to run autotools during build
-# Temporary fix (I hope!) - JAMES
-ACLOCAL = 
-AUTOCONF = 
-AUTOMAKE = 
-AUTOHEADER = 
+# Set the paths for autotools to be correct on heping.
+# Ideally, these tools should never be needed during the build.
+ACLOCAL = /usr/bin/aclocal
+AUTOCONF = /usr/local/autoconf-2.59/bin/autoconf
+AUTOMAKE = /usr/bin/automake
+AUTOHEADER = /usr/local/autoconf-2.59/bin/autoheader
 ADD_PARALLEL_FILES = @ADD_PARALLEL_FILES@
 AMTAR = @AMTAR@
 AR = @AR@
diff --git a/hl/src/Makefile.in b/hl/src/Makefile.in
index 8d47f7d..8ca88eb 100644
--- a/hl/src/Makefile.in
+++ b/hl/src/Makefile.in
@@ -82,12 +82,12 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 includedir = $(exec_prefix)/include
 
 
-# Prevent automake from trying to run autotools during build
-# Temporary fix (I hope!) - JAMES
-ACLOCAL = 
-AUTOCONF = 
-AUTOMAKE = 
-AUTOHEADER = 
+# Set the paths for autotools to be correct on heping.
+# Ideally, these tools should never be needed during the build.
+ACLOCAL = /usr/bin/aclocal
+AUTOCONF = /usr/local/autoconf-2.59/bin/autoconf
+AUTOMAKE = /usr/bin/automake
+AUTOHEADER = /usr/local/autoconf-2.59/bin/autoheader
 ADD_PARALLEL_FILES = @ADD_PARALLEL_FILES@
 AMTAR = @AMTAR@
 AR = @AR@
diff --git a/hl/test/Makefile.in b/hl/test/Makefile.in
index cc479bf..a80047f 100644
--- a/hl/test/Makefile.in
+++ b/hl/test/Makefile.in
@@ -84,12 +84,12 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 includedir = $(exec_prefix)/include
 
 
-# Prevent automake from trying to run autotools during build
-# Temporary fix (I hope!) - JAMES
-ACLOCAL = 
-AUTOCONF = 
-AUTOMAKE = 
-AUTOHEADER = 
+# Set the paths for autotools to be correct on heping.
+# Ideally, these tools should never be needed during the build.
+ACLOCAL = /usr/bin/aclocal
+AUTOCONF = /usr/local/autoconf-2.59/bin/autoconf
+AUTOMAKE = /usr/bin/automake
+AUTOHEADER = /usr/local/autoconf-2.59/bin/autoheader
 ADD_PARALLEL_FILES = @ADD_PARALLEL_FILES@
 AMTAR = @AMTAR@
 AR = @AR@
diff --git a/hl/tools/gif2h5/Makefile.in b/hl/tools/gif2h5/Makefile.in
index 52cb4ed..48a06a8 100644
--- a/hl/tools/gif2h5/Makefile.in
+++ b/hl/tools/gif2h5/Makefile.in
@@ -92,12 +92,12 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 includedir = $(exec_prefix)/include
 
 
-# Prevent automake from trying to run autotools during build
-# Temporary fix (I hope!) - JAMES
-ACLOCAL = 
-AUTOCONF = 
-AUTOMAKE = 
-AUTOHEADER = 
+# Set the paths for autotools to be correct on heping.
+# Ideally, these tools should never be needed during the build.
+ACLOCAL = /usr/bin/aclocal
+AUTOCONF = /usr/local/autoconf-2.59/bin/autoconf
+AUTOMAKE = /usr/bin/automake
+AUTOHEADER = /usr/local/autoconf-2.59/bin/autoheader
 ADD_PARALLEL_FILES = @ADD_PARALLEL_FILES@
 AMTAR = @AMTAR@
 AR = @AR@
diff --git a/perform/Makefile.in b/perform/Makefile.in
index f13c7dc..adae9d6 100644
--- a/perform/Makefile.in
+++ b/perform/Makefile.in
@@ -92,12 +92,12 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 includedir = $(exec_prefix)/include
 
 
-# Prevent automake from trying to run autotools during build
-# Temporary fix (I hope!) - JAMES
-ACLOCAL = 
-AUTOCONF = 
-AUTOMAKE = 
-AUTOHEADER = 
+# Set the paths for autotools to be correct on heping.
+# Ideally, these tools should never be needed during the build.
+ACLOCAL = /usr/bin/aclocal
+AUTOCONF = /usr/local/autoconf-2.59/bin/autoconf
+AUTOMAKE = /usr/bin/automake
+AUTOHEADER = /usr/local/autoconf-2.59/bin/autoheader
 ADD_PARALLEL_FILES = @ADD_PARALLEL_FILES@
 AMTAR = @AMTAR@
 AR = @AR@
diff --git a/src/Makefile.in b/src/Makefile.in
index 97a11ad..9d04000 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -92,12 +92,12 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 includedir = $(exec_prefix)/include
 
 
-# Prevent automake from trying to run autotools during build
-# Temporary fix (I hope!) - JAMES
-ACLOCAL = 
-AUTOCONF = 
-AUTOMAKE = 
-AUTOHEADER = 
+# Set the paths for autotools to be correct on heping.
+# Ideally, these tools should never be needed during the build.
+ACLOCAL = /usr/bin/aclocal
+AUTOCONF = /usr/local/autoconf-2.59/bin/autoconf
+AUTOMAKE = /usr/bin/automake
+AUTOHEADER = /usr/local/autoconf-2.59/bin/autoheader
 ADD_PARALLEL_FILES = @ADD_PARALLEL_FILES@
 AMTAR = @AMTAR@
 AR = @AR@
diff --git a/test/Makefile.in b/test/Makefile.in
index 1378432..4d04729 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -92,12 +92,12 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 includedir = $(exec_prefix)/include
 
 
-# Prevent automake from trying to run autotools during build
-# Temporary fix (I hope!) - JAMES
-ACLOCAL = 
-AUTOCONF = 
-AUTOMAKE = 
-AUTOHEADER = 
+# Set the paths for autotools to be correct on heping.
+# Ideally, these tools should never be needed during the build.
+ACLOCAL = /usr/bin/aclocal
+AUTOCONF = /usr/local/autoconf-2.59/bin/autoconf
+AUTOMAKE = /usr/bin/automake
+AUTOHEADER = /usr/local/autoconf-2.59/bin/autoheader
 ADD_PARALLEL_FILES = @ADD_PARALLEL_FILES@
 AMTAR = @AMTAR@
 AR = @AR@
diff --git a/testpar/Makefile.in b/testpar/Makefile.in
index c8b2d5d..54fc327 100644
--- a/testpar/Makefile.in
+++ b/testpar/Makefile.in
@@ -92,12 +92,12 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 includedir = $(exec_prefix)/include
 
 
-# Prevent automake from trying to run autotools during build
-# Temporary fix (I hope!) - JAMES
-ACLOCAL = 
-AUTOCONF = 
-AUTOMAKE = 
-AUTOHEADER = 
+# Set the paths for autotools to be correct on heping.
+# Ideally, these tools should never be needed during the build.
+ACLOCAL = /usr/bin/aclocal
+AUTOCONF = /usr/local/autoconf-2.59/bin/autoconf
+AUTOMAKE = /usr/bin/automake
+AUTOHEADER = /usr/local/autoconf-2.59/bin/autoheader
 ADD_PARALLEL_FILES = @ADD_PARALLEL_FILES@
 AMTAR = @AMTAR@
 AR = @AR@
diff --git a/tools/Makefile.in b/tools/Makefile.in
index 4d7ae58..1586346 100644
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@@ -92,12 +92,12 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 includedir = $(exec_prefix)/include
 
 
-# Prevent automake from trying to run autotools during build
-# Temporary fix (I hope!) - JAMES
-ACLOCAL = 
-AUTOCONF = 
-AUTOMAKE = 
-AUTOHEADER = 
+# Set the paths for autotools to be correct on heping.
+# Ideally, these tools should never be needed during the build.
+ACLOCAL = /usr/bin/aclocal
+AUTOCONF = /usr/local/autoconf-2.59/bin/autoconf
+AUTOMAKE = /usr/bin/automake
+AUTOHEADER = /usr/local/autoconf-2.59/bin/autoheader
 ADD_PARALLEL_FILES = @ADD_PARALLEL_FILES@
 AMTAR = @AMTAR@
 AR = @AR@
diff --git a/tools/gifconv/Makefile.in b/tools/gifconv/Makefile.in
index 52cb4ed..48a06a8 100644
--- a/tools/gifconv/Makefile.in
+++ b/tools/gifconv/Makefile.in
@@ -92,12 +92,12 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 includedir = $(exec_prefix)/include
 
 
-# Prevent automake from trying to run autotools during build
-# Temporary fix (I hope!) - JAMES
-ACLOCAL = 
-AUTOCONF = 
-AUTOMAKE = 
-AUTOHEADER = 
+# Set the paths for autotools to be correct on heping.
+# Ideally, these tools should never be needed during the build.
+ACLOCAL = /usr/bin/aclocal
+AUTOCONF = /usr/local/autoconf-2.59/bin/autoconf
+AUTOMAKE = /usr/bin/automake
+AUTOHEADER = /usr/local/autoconf-2.59/bin/autoheader
 ADD_PARALLEL_FILES = @ADD_PARALLEL_FILES@
 AMTAR = @AMTAR@
 AR = @AR@
diff --git a/tools/h5diff/Makefile.in b/tools/h5diff/Makefile.in
index 98b323a..8e3b50b 100644
--- a/tools/h5diff/Makefile.in
+++ b/tools/h5diff/Makefile.in
@@ -92,12 +92,12 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 includedir = $(exec_prefix)/include
 
 
-# Prevent automake from trying to run autotools during build
-# Temporary fix (I hope!) - JAMES
-ACLOCAL = 
-AUTOCONF = 
-AUTOMAKE = 
-AUTOHEADER = 
+# Set the paths for autotools to be correct on heping.
+# Ideally, these tools should never be needed during the build.
+ACLOCAL = /usr/bin/aclocal
+AUTOCONF = /usr/local/autoconf-2.59/bin/autoconf
+AUTOMAKE = /usr/bin/automake
+AUTOHEADER = /usr/local/autoconf-2.59/bin/autoheader
 ADD_PARALLEL_FILES = @ADD_PARALLEL_FILES@
 AMTAR = @AMTAR@
 AR = @AR@
diff --git a/tools/h5dump/Makefile.in b/tools/h5dump/Makefile.in
index d8eb9ed..db1145f 100644
--- a/tools/h5dump/Makefile.in
+++ b/tools/h5dump/Makefile.in
@@ -92,12 +92,12 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 includedir = $(exec_prefix)/include
 
 
-# Prevent automake from trying to run autotools during build
-# Temporary fix (I hope!) - JAMES
-ACLOCAL = 
-AUTOCONF = 
-AUTOMAKE = 
-AUTOHEADER = 
+# Set the paths for autotools to be correct on heping.
+# Ideally, these tools should never be needed during the build.
+ACLOCAL = /usr/bin/aclocal
+AUTOCONF = /usr/local/autoconf-2.59/bin/autoconf
+AUTOMAKE = /usr/bin/automake
+AUTOHEADER = /usr/local/autoconf-2.59/bin/autoheader
 ADD_PARALLEL_FILES = @ADD_PARALLEL_FILES@
 AMTAR = @AMTAR@
 AR = @AR@
diff --git a/tools/h5import/Makefile.in b/tools/h5import/Makefile.in
index 0693c7b..58ab70b 100755
--- a/tools/h5import/Makefile.in
+++ b/tools/h5import/Makefile.in
@@ -92,12 +92,12 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 includedir = $(exec_prefix)/include
 
 
-# Prevent automake from trying to run autotools during build
-# Temporary fix (I hope!) - JAMES
-ACLOCAL = 
-AUTOCONF = 
-AUTOMAKE = 
-AUTOHEADER = 
+# Set the paths for autotools to be correct on heping.
+# Ideally, these tools should never be needed during the build.
+ACLOCAL = /usr/bin/aclocal
+AUTOCONF = /usr/local/autoconf-2.59/bin/autoconf
+AUTOMAKE = /usr/bin/automake
+AUTOHEADER = /usr/local/autoconf-2.59/bin/autoheader
 ADD_PARALLEL_FILES = @ADD_PARALLEL_FILES@
 AMTAR = @AMTAR@
 AR = @AR@
diff --git a/tools/h5jam/Makefile.in b/tools/h5jam/Makefile.in
index 8def6f4..aa53f5f 100644
--- a/tools/h5jam/Makefile.in
+++ b/tools/h5jam/Makefile.in
@@ -76,12 +76,12 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 includedir = $(exec_prefix)/include
 
 
-# Prevent automake from trying to run autotools during build
-# Temporary fix (I hope!) - JAMES
-ACLOCAL = 
-AUTOCONF = 
-AUTOMAKE = 
-AUTOHEADER = 
+# Set the paths for autotools to be correct on heping.
+# Ideally, these tools should never be needed during the build.
+ACLOCAL = /usr/bin/aclocal
+AUTOCONF = /usr/local/autoconf-2.59/bin/autoconf
+AUTOMAKE = /usr/bin/automake
+AUTOHEADER = /usr/local/autoconf-2.59/bin/autoheader
 ADD_PARALLEL_FILES = @ADD_PARALLEL_FILES@
 AMTAR = @AMTAR@
 AR = @AR@
diff --git a/tools/h5ls/Makefile.in b/tools/h5ls/Makefile.in
index c6b771e..d02ebeb 100644
--- a/tools/h5ls/Makefile.in
+++ b/tools/h5ls/Makefile.in
@@ -92,12 +92,12 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 includedir = $(exec_prefix)/include
 
 
-# Prevent automake from trying to run autotools during build
-# Temporary fix (I hope!) - JAMES
-ACLOCAL = 
-AUTOCONF = 
-AUTOMAKE = 
-AUTOHEADER = 
+# Set the paths for autotools to be correct on heping.
+# Ideally, these tools should never be needed during the build.
+ACLOCAL = /usr/bin/aclocal
+AUTOCONF = /usr/local/autoconf-2.59/bin/autoconf
+AUTOMAKE = /usr/bin/automake
+AUTOHEADER = /usr/local/autoconf-2.59/bin/autoheader
 ADD_PARALLEL_FILES = @ADD_PARALLEL_FILES@
 AMTAR = @AMTAR@
 AR = @AR@
diff --git a/tools/h5repack/Makefile.in b/tools/h5repack/Makefile.in
index 28f2e33..da9ce75 100644
--- a/tools/h5repack/Makefile.in
+++ b/tools/h5repack/Makefile.in
@@ -92,12 +92,12 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 includedir = $(exec_prefix)/include
 
 
-# Prevent automake from trying to run autotools during build
-# Temporary fix (I hope!) - JAMES
-ACLOCAL = 
-AUTOCONF = 
-AUTOMAKE = 
-AUTOHEADER = 
+# Set the paths for autotools to be correct on heping.
+# Ideally, these tools should never be needed during the build.
+ACLOCAL = /usr/bin/aclocal
+AUTOCONF = /usr/local/autoconf-2.59/bin/autoconf
+AUTOMAKE = /usr/bin/automake
+AUTOHEADER = /usr/local/autoconf-2.59/bin/autoheader
 ADD_PARALLEL_FILES = @ADD_PARALLEL_FILES@
 AMTAR = @AMTAR@
 AR = @AR@
diff --git a/tools/lib/Makefile.in b/tools/lib/Makefile.in
index af7efa6..e6d480b 100644
--- a/tools/lib/Makefile.in
+++ b/tools/lib/Makefile.in
@@ -92,12 +92,12 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 includedir = $(exec_prefix)/include
 
 
-# Prevent automake from trying to run autotools during build
-# Temporary fix (I hope!) - JAMES
-ACLOCAL = 
-AUTOCONF = 
-AUTOMAKE = 
-AUTOHEADER = 
+# Set the paths for autotools to be correct on heping.
+# Ideally, these tools should never be needed during the build.
+ACLOCAL = /usr/bin/aclocal
+AUTOCONF = /usr/local/autoconf-2.59/bin/autoconf
+AUTOMAKE = /usr/bin/automake
+AUTOHEADER = /usr/local/autoconf-2.59/bin/autoheader
 ADD_PARALLEL_FILES = @ADD_PARALLEL_FILES@
 AMTAR = @AMTAR@
 AR = @AR@
diff --git a/tools/misc/Makefile.in b/tools/misc/Makefile.in
index d5cfcf2..8902f4d 100644
--- a/tools/misc/Makefile.in
+++ b/tools/misc/Makefile.in
@@ -92,12 +92,12 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 includedir = $(exec_prefix)/include
 
 
-# Prevent automake from trying to run autotools during build
-# Temporary fix (I hope!) - JAMES
-ACLOCAL = 
-AUTOCONF = 
-AUTOMAKE = 
-AUTOHEADER = 
+# Set the paths for autotools to be correct on heping.
+# Ideally, these tools should never be needed during the build.
+ACLOCAL = /usr/bin/aclocal
+AUTOCONF = /usr/local/autoconf-2.59/bin/autoconf
+AUTOMAKE = /usr/bin/automake
+AUTOHEADER = /usr/local/autoconf-2.59/bin/autoheader
 ADD_PARALLEL_FILES = @ADD_PARALLEL_FILES@
 AMTAR = @AMTAR@
 AR = @AR@