philipp/hdf5
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[svn-r17439] Purpose:

Browse Source 
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.
This commit is contained in:
Mike McGreevy
2009-08-31 10:28:10 -05:00
parent 4f9b08427b
commit ee3ed7a67f
47 changed files with 11289 additions and 33045 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
bin/reconfigure
View File

@@ -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