diff options
| author | Mike McGreevy <mamcgree@hdfgroup.org> | 2008-05-05 18:35:55 (GMT) |
|---|---|---|
| committer | Mike McGreevy <mamcgree@hdfgroup.org> | 2008-05-05 18:35:55 (GMT) |
| commit | 5bd2405c11837865b6d7c54e30933dbc0b43c938 (patch) | |
| tree | 3846aa1cfe5990b95aaf591904c74582d0fec683 /bin/reconfigure | |
| parent | e182fc3bb89b465640b6428c15abd57e1b3fd8e6 (diff) | |
| download | hdf5-5bd2405c11837865b6d7c54e30933dbc0b43c938.zip hdf5-5bd2405c11837865b6d7c54e30933dbc0b43c938.tar.gz hdf5-5bd2405c11837865b6d7c54e30933dbc0b43c938.tar.bz2 | |
[svn-r14933] Purpose: Updating HDF5 to use automake 1.10.1 and libtool 2.2.2
Description: Applying update to autotools that was applied to 1.8 a couple
of weeks ago to the trunk.
Updated bin/reconfigure script to reflect the new versions of
libtool and automake in the /home1/packages/ directory.
Rearranged configure.in script. When using libtool 2.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 (h5committest)
Diffstat (limited to 'bin/reconfigure')
| -rwxr-xr-x | bin/reconfigure | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/bin/reconfigure b/bin/reconfigure index 3ead9a9..4665dae 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.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.2/bin/libtool fi # Check version numbers of all autotools against the "correct" versions |