summaryrefslogtreecommitdiffstats
path: root/bin/reconfigure
diff options
context:
space:
mode:
authorJames Laird <jlaird@hdfgroup.org>2006-11-16 20:44:35 (GMT)
committerJames Laird <jlaird@hdfgroup.org>2006-11-16 20:44:35 (GMT)
commit6b5a918b1e2da1f56d1026704e652a0bc17f1882 (patch)
tree20f4de53a561317c989163c06cbeb05741b2e63e /bin/reconfigure
parent8040a0f38168981415a3350bc7baa01a6d6409b8 (diff)
downloadhdf5-6b5a918b1e2da1f56d1026704e652a0bc17f1882.zip
hdf5-6b5a918b1e2da1f56d1026704e652a0bc17f1882.tar.gz
hdf5-6b5a918b1e2da1f56d1026704e652a0bc17f1882.tar.bz2
[svn-r12929] Hopefully this really is a fix for the tg-login errors.
The version of libtool used by HDF5 isn't directly affected by the reconfigure script; instead, libtoolize --force must be used by hand. Libtool was the source of the problem, so rolling its version back to 1.5.14 should solve the issue (at least temporarily). Reconfigure should still work on both heping and kagiso. Tested on heping, kagiso, and tg-login3.
Diffstat (limited to 'bin/reconfigure')
-rwxr-xr-xbin/reconfigure12
1 files changed, 6 insertions, 6 deletions
diff --git a/bin/reconfigure b/bin/reconfigure
index 242468a..283a81e 100755
--- a/bin/reconfigure
+++ b/bin/reconfigure
@@ -29,9 +29,9 @@
# HDF5 currently uses the following versions of the autotools:
AUTOCONF_VERSION="autoconf (GNU Autoconf) 2.60"
-AUTOMAKE_VERSION="automake (GNU automake) 1.9.5"
+AUTOMAKE_VERSION="automake (GNU automake) 1.9.6"
AUTOHEADER_VERSION="autoheader (GNU Autoconf) 2.60"
-ACLOCAL_VERSION="aclocal (GNU automake) 1.9.5"
+ACLOCAL_VERSION="aclocal (GNU automake) 1.9.6"
LIBTOOL_VERSION="(GNU libtool) 1.5.14"
#
# When upgrading automake's version, don't forget to also update its
@@ -41,9 +41,9 @@ LIBTOOL_VERSION="(GNU libtool) 1.5.14"
kagiso=`hostname | grep "^kagiso"`
if test "x${kagiso}" != "x"; then
AUTOCONF=/home1/packages/autoconf/autoconf-2.60/bin/autoconf
- AUTOMAKE=/home1/packages/automake/automake-1.9.5-2/bin/automake-1.9
+ AUTOMAKE=/home1/packages/automake/automake-1.9.6/bin/automake-1.9
AUTOHEADER=/home1/packages/autoconf/autoconf-2.60/bin/autoheader
- ACLOCAL=/home1/packages/automake/automake-1.9.5-2/bin/aclocal-1.9
+ ACLOCAL=/home1/packages/automake/automake-1.9.6/bin/aclocal-1.9
# When using the default settings, add the correct version of autoconf
# binaries to path (otherwise aclocal may find an outdated version of
# autom4ate and complain about an
@@ -64,13 +64,13 @@ if test -z ${AUTOCONF}; then
AUTOCONF=/afs/ncsa/projects/hdf/packages/autoconf-2.60/bin/autoconf
fi
if test -z ${AUTOMAKE}; then
- AUTOMAKE=/afs/ncsa/projects/hdf/packages/automake_1.9.5/Linux_2.4/bin/automake-1.9
+ AUTOMAKE=/afs/ncsa/projects/hdf/packages/automake-1.9.6/bin/automake-1.9
fi
if test -z ${AUTOHEADER}; then
AUTOHEADER=/afs/ncsa/projects/hdf/packages/autoconf-2.60/bin/autoheader
fi
if test -z ${ACLOCAL}; then
- ACLOCAL=/afs/ncsa/projects/hdf/packages/automake_1.9.5/Linux_2.4/bin/aclocal-1.9
+ ACLOCAL=/afs/ncsa/projects/hdf/packages/automake-1.9.6/bin/aclocal-1.9
fi
if test -z ${LIBTOOL}; then
LIBTOOL=/afs/ncsa/projects/hdf/packages/libtool_1.5.14/Linux_2.4/bin/libtool