diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2009-08-12 22:04:35 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2009-08-12 22:04:35 (GMT) |
| commit | 328d540a34a6ccabd9a354453b38accef0dd6682 (patch) | |
| tree | 3f2338d555f4b059fbfd34c49ce3d2d49321b150 /bin | |
| parent | 7a1fcfa41974c02b1b7787e2f9627e0027868860 (diff) | |
| download | hdf5-328d540a34a6ccabd9a354453b38accef0dd6682.zip hdf5-328d540a34a6ccabd9a354453b38accef0dd6682.tar.gz hdf5-328d540a34a6ccabd9a354453b38accef0dd6682.tar.bz2 | |
[svn-r17347] Description:
Bring r17299:17346 from trunk to revise_chunks branch (including
rerunning bin/reconfigure, after the autotools update in the trunk)
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/C++ & FORTRAN, w/threadsafe,
in debug mode
Linux/64-amd64 2.6 (smirom) 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-amd64 2.6 (abe) w/parallel, w/FORTRAN, in production mode
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/reconfigure | 16 |
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 |