summaryrefslogtreecommitdiffstats
path: root/bin/reconfigure
diff options
context:
space:
mode:
authorMike McGreevy <mamcgree@hdfgroup.org>2008-04-10 20:52:14 (GMT)
committerMike McGreevy <mamcgree@hdfgroup.org>2008-04-10 20:52:14 (GMT)
commit934d53254405a1fe5b87773d751d64e380470557 (patch)
tree3a85e17288ea27176582e83f220ad61d18e11bd4 /bin/reconfigure
parent19077b27d0885b9414a41e75cf7f5f151665e2ad (diff)
downloadhdf5-934d53254405a1fe5b87773d751d64e380470557.zip
hdf5-934d53254405a1fe5b87773d751d64e380470557.tar.gz
hdf5-934d53254405a1fe5b87773d751d64e380470557.tar.bz2
[svn-r14824] Purpose: Updating HDF5 1.8 to use automake 1.10.1 and libtool 2.2
Description: Updated bin/reconfigure script to reflect the new versions of libtool and automake in the /home1/packages/ directory. Rearranged configure.in script. For some reason, when using libtool 2.2, the libtool script doesn't generate until later in the configuration process, so I had to move a test that parsed through the libtool script to a point after where it was actually being generated. Ran libtoolize on the project, and ran bin/reconfigure to regenerate configure and Makefile.in's throughout. Tested: kagiso, smirom, linew, tg-login
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 3ead9a9..da48d2d 100755
--- a/bin/reconfigure
+++ b/bin/reconfigure
@@ -29,10 +29,10 @@
# HDF5 currently uses the following versions of the autotools:
AUTOCONF_VERSION="autoconf (GNU Autoconf) 2.61"
-AUTOMAKE_VERSION="automake (GNU automake) 1.10"
+AUTOMAKE_VERSION="automake (GNU automake) 1.10.1"
AUTOHEADER_VERSION="autoheader (GNU Autoconf) 2.61"
-ACLOCAL_VERSION="aclocal (GNU automake) 1.10"
-LIBTOOL_VERSION="(GNU libtool) 1.5.22"
+ACLOCAL_VERSION="aclocal (GNU automake) 1.10.1"
+LIBTOOL_VERSION="(GNU libtool) 2.2"
#
# When upgrading automake's version, don't forget to also update its
# helper utilities, especially depcomp.
@@ -44,16 +44,16 @@ if test -z ${AUTOCONF}; then
AUTOCONF=/home1/packages/autoconf/autoconf-2.61/bin/autoconf
fi
if test -z ${AUTOMAKE}; then
- AUTOMAKE=/home1/packages/automake/automake-1.10.0/bin/automake-1.10
+ AUTOMAKE=/home1/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
fi
if test -z ${ACLOCAL}; then
- ACLOCAL=/home1/packages/automake/automake-1.10.0/bin/aclocal-1.10
+ ACLOCAL=/home1/packages/automake/automake-1.10.1/bin/aclocal-1.10
fi
if test -z ${LIBTOOL}; then
- LIBTOOL=/home1/packages/libtool/libtool-1.5.22/bin/libtool
+ LIBTOOL=/home1/packages/libtool/libtool-2.2/bin/libtool
fi
# Check version numbers of all autotools against the "correct" versions