summaryrefslogtreecommitdiffstats
path: root/bin/reconfigure
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2010-04-15 23:05:51 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2010-04-15 23:05:51 (GMT)
commit97f8b83e2d35fe3be71217977b339077cbbd46d8 (patch)
treec71f1d2b5ab0da114a6fcf4f03a229051fd88c10 /bin/reconfigure
parent13d61651f8bfba0739aac1cad17d4b11affb59ae (diff)
downloadhdf5-97f8b83e2d35fe3be71217977b339077cbbd46d8.zip
hdf5-97f8b83e2d35fe3be71217977b339077cbbd46d8.tar.gz
hdf5-97f8b83e2d35fe3be71217977b339077cbbd46d8.tar.bz2
[svn-r18582] Description:
Bring r18533:18581 from trunk to revise_chunks branch. Tested on: FreeBSD/32 6.3 (duty) in debug mode FreeBSD/64 6.3 (liberty) w/C++ & FORTRAN, in debug mode Linux/32 2.6 (jam) w/PGI compilers, w/default API=1.8.x, w/C++ & FORTRAN, w/threadsafe, in debug mode Linux/64-amd64 2.6 (amani) w/Intel compilers, w/default API=1.6.x, w/C++ & FORTRAN, in production mode Solaris/32 2.10 (linew) w/deprecated symbols disabled, w/C++ & FORTRAN, w/szip filter, in production mode Linux/64-ia64 2.6 (cobalt) w/Intel compilers, w/C++ & FORTRAN, in production mode Linux/64-ia64 2.4 (tg-login3) w/parallel, w/FORTRAN, in debug mode Linux/64-amd64 2.6 (abe) w/parallel, w/FORTRAN, in production mode Mac OS X/32 10.6.3 (amazon) in debug mode Mac OS X/32 10.6.3 (amazon) w/C++ & FORTRAN, w/threadsafe, in production mode
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