summaryrefslogtreecommitdiffstats
path: root/bin/reconfigure
diff options
context:
space:
mode:
authorMike McGreevy <mamcgree@hdfgroup.org>2010-04-15 21:17:22 (GMT)
committerMike McGreevy <mamcgree@hdfgroup.org>2010-04-15 21:17:22 (GMT)
commit0cf2a97cfbb6261cea3645d9109a7313e8bb9f5a (patch)
treece9a5c86892be6162b739a147fa9e0dd453dcb85 /bin/reconfigure
parent5dfdf41dfc2ca4f22529effacc0913681fae7e34 (diff)
downloadhdf5-0cf2a97cfbb6261cea3645d9109a7313e8bb9f5a.zip
hdf5-0cf2a97cfbb6261cea3645d9109a7313e8bb9f5a.tar.gz
hdf5-0cf2a97cfbb6261cea3645d9109a7313e8bb9f5a.tar.bz2
[svn-r18579] Purpose:
Autotool Upgrade / Libtool Bug Fix Description: Updated autotools referenced in bin/reconfigure as follows: Autoconf 2.64 --> Autoconf 2.65 Automake 1.11 --> Automake 1.11.1 Libtool 2.2.6a --> Libtool 2.2.6b-mcg The referenced libtool version is a custom version of 2.2.6b. It has been tweaked to fix a bug in libtool that occurs when using PGI 10.0 compilers. A check incorrectly categorizes the C++ compiler as version 1.0 instead of 10.0, and the link line is subsequently set up incorrectly and fails to compile. A patch has been made available and will be included in the next release of libtool, but in the meantime I've applied the patch to a custom installation as indicated above. This bin/reconfigure now references the custom installation, and the resulting configure script will correctly categorize the PGI 10.0 C++ compiler. Ran bin/reconfigure to regenerate configure and makefiles. Tested: jam and amani with PGI 10.0 compilers. h5committest
Diffstat (limited to 'bin/reconfigure')
-rwxr-xr-xbin/reconfigure22
1 files changed, 11 insertions, 11 deletions
diff --git a/bin/reconfigure b/bin/reconfigure
index 65a46bc..50428f4 100755
--- a/bin/reconfigure
+++ b/bin/reconfigure
@@ -28,32 +28,32 @@
# 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.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"
+AUTOCONF_VERSION="autoconf (GNU Autoconf) 2.65"
+AUTOMAKE_VERSION="automake (GNU automake) 1.11.1"
+AUTOHEADER_VERSION="autoheader (GNU Autoconf) 2.65"
+ACLOCAL_VERSION="aclocal (GNU automake) 1.11.1"
+LIBTOOL_VERSION="(GNU libtool) 2.2.6b-mcg"
#
# When upgrading automake's version, don't forget to also update its
# helper utilities, especially depcomp.
# If paths to autotools are not specified by the user, assume tools are
-# running on kagiso and set paths accordingly.
+# running on jam in /mnt/hdf/packages and set paths accordingly.
if test -z ${AUTOCONF}; then
- AUTOCONF=/mnt/hdf/packages/autoconf/autoconf-2.64/bin/autoconf
+ AUTOCONF=/mnt/hdf/packages/autoconf/autoconf-2.65/bin/autoconf
fi
if test -z ${AUTOMAKE}; then
- AUTOMAKE=/mnt/hdf/packages/automake/automake-1.11/bin/automake-1.11
+ AUTOMAKE=/mnt/hdf/packages/automake/automake-1.11.1/bin/automake-1.11
fi
if test -z ${AUTOHEADER}; then
- AUTOHEADER=/mnt/hdf/packages/autoconf/autoconf-2.64/bin/autoheader
+ AUTOHEADER=/mnt/hdf/packages/autoconf/autoconf-2.65/bin/autoheader
fi
if test -z ${ACLOCAL}; then
- ACLOCAL=/mnt/hdf/packages/automake/automake-1.11/bin/aclocal-1.11
+ ACLOCAL=/mnt/hdf/packages/automake/automake-1.11.1/bin/aclocal-1.11
fi
if test -z ${LIBTOOL}; then
- LIBTOOL=/mnt/hdf/packages/libtool/libtool-2.2.6a/bin/libtool
+ LIBTOOL=/mnt/hdf/packages/libtool/libtool-2.2.6b-mcg/bin/libtool
fi
# Check version numbers of all autotools against the "correct" versions