summaryrefslogtreecommitdiffstats
path: root/bin/reconfigure
diff options
context:
space:
mode:
authorMike McGreevy <mamcgree@hdfgroup.org>2009-08-31 15:28:10 (GMT)
committerMike McGreevy <mamcgree@hdfgroup.org>2009-08-31 15:28:10 (GMT)
commitee3ed7a67ff8a3d8a3ce2dac4e6942724ba33c85 (patch)
tree44745f201d341aae51163b31b89d378776de516a /bin/reconfigure
parent4f9b08427b90139c3d21d8f8d5742f29f9f2722d (diff)
downloadhdf5-ee3ed7a67ff8a3d8a3ce2dac4e6942724ba33c85.zip
hdf5-ee3ed7a67ff8a3d8a3ce2dac4e6942724ba33c85.tar.gz
hdf5-ee3ed7a67ff8a3d8a3ce2dac4e6942724ba33c85.tar.bz2
[svn-r17439] Purpose:
Updating autotools Description: Bring revisions 17345 and 17357 from trunk to 1.8, specifically: - Automake upgraded to 1.11 - Autoconf upgraded to 2.64 - bin/reconfigure script edited to use new versions (on jam), and run to generate new configure script and Makefile.in's. - configure.in script edited to add "_cv_" to all AC_CACHE_VAL strings (in order to comply with new autoconf standard). - bin/install-sh script replaced with new version as provided by automake. Tested: - All issues on trunk were resolved, so only tested on jam and linew. Any other outliers should be caught by daily tests.
Diffstat (limited to 'bin/reconfigure')
-rwxr-xr-xbin/reconfigure16
1 files changed, 8 insertions, 8 deletions
diff --git a/bin/reconfigure b/bin/reconfigure
index 1fffa45..65a46bc 100755
--- a/bin/reconfigure
+++ b/bin/reconfigure
@@ -28,10 +28,10 @@
# 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.2"
-AUTOHEADER_VERSION="autoheader (GNU Autoconf) 2.61"
-ACLOCAL_VERSION="aclocal (GNU automake) 1.10.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
@@ -41,16 +41,16 @@ LIBTOOL_VERSION="(GNU libtool) 2.2.6"
# 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=/mnt/hdf/packages/autoconf/autoconf-2.61/bin/autoconf
+ AUTOCONF=/mnt/hdf/packages/autoconf/autoconf-2.64/bin/autoconf
fi
if test -z ${AUTOMAKE}; then
- AUTOMAKE=/mnt/hdf/packages/automake/automake-1.10.2/bin/automake-1.10
+ AUTOMAKE=/mnt/hdf/packages/automake/automake-1.11/bin/automake-1.11
fi
if test -z ${AUTOHEADER}; then
- AUTOHEADER=/mnt/hdf/packages/autoconf/autoconf-2.61/bin/autoheader
+ AUTOHEADER=/mnt/hdf/packages/autoconf/autoconf-2.64/bin/autoheader
fi
if test -z ${ACLOCAL}; then
- ACLOCAL=/mnt/hdf/packages/automake/automake-1.10.2/bin/aclocal-1.10
+ ACLOCAL=/mnt/hdf/packages/automake/automake-1.11/bin/aclocal-1.11
fi
if test -z ${LIBTOOL}; then
LIBTOOL=/mnt/hdf/packages/libtool/libtool-2.2.6a/bin/libtool