diff options
Diffstat (limited to 'bin/reconfigure')
| -rwxr-xr-x | bin/reconfigure | 57 |
1 files changed, 19 insertions, 38 deletions
diff --git a/bin/reconfigure b/bin/reconfigure index 283a81e..5c4a7b1 100755 --- a/bin/reconfigure +++ b/bin/reconfigure @@ -9,14 +9,14 @@ # of the source code distribution tree; Copyright.html can be found at the # root level of an installed copy of the electronic HDF5 document set and # is linked from the top-level documents page. It can also be found at -# http://hdf.ncsa.uiuc.edu/HDF5/doc/Copyright.html. If you do not have -# access to either file, you may request a copy from hdfhelp@ncsa.uiuc.edu. +# http://hdfgroup.org/HDF5/doc/Copyright.html. If you do not have +# access to either file, you may request a copy from help@hdfgroup.org. # # A script to reconfigure autotools for HDF5, and to recreate other # generated files specifc to HDF5. # If the paths of the autotools are not specified by the user, they -# are hardcoded to point to their locations in AFS on HDF5 Linux machines. +# are hardcoded to point to their locations on HDF5 Linux machines. # Users can specify the locations of the autotools with the following # variables: # AUTOCONF, AUTOMAKE, ACLOCAL, AUTOHEADER should be the path to the @@ -28,52 +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.60" -AUTOMAKE_VERSION="automake (GNU automake) 1.9.6" -AUTOHEADER_VERSION="autoheader (GNU Autoconf) 2.60" -ACLOCAL_VERSION="aclocal (GNU automake) 1.9.6" -LIBTOOL_VERSION="(GNU libtool) 1.5.14" +AUTOCONF_VERSION="autoconf (GNU Autoconf) 2.61" +AUTOMAKE_VERSION="automake (GNU automake) 1.10" +AUTOHEADER_VERSION="autoheader (GNU Autoconf) 2.61" +ACLOCAL_VERSION="aclocal (GNU automake) 1.10" +LIBTOOL_VERSION="(GNU libtool) 1.5.22" # # When upgrading automake's version, don't forget to also update its # helper utilities, especially depcomp. -# If we're running on kagiso, set up paths to point to the correct autotools here -kagiso=`hostname | grep "^kagiso"` -if test "x${kagiso}" != "x"; then - AUTOCONF=/home1/packages/autoconf/autoconf-2.60/bin/autoconf - AUTOMAKE=/home1/packages/automake/automake-1.9.6/bin/automake-1.9 - AUTOHEADER=/home1/packages/autoconf/autoconf-2.60/bin/autoheader - ACLOCAL=/home1/packages/automake/automake-1.9.6/bin/aclocal-1.9 - # When using the default settings, add the correct version of autoconf - # binaries to path (otherwise aclocal may find an outdated version of - # autom4ate and complain about an - # "unknown language": Autoconf-without-aclocal-m4. - PATH=/home1/packages/autoconf-2.60/bin:$PATH - # Use the latest version of M4 - PATH=/home1/packages/m4/m4-1.4.7/bin:/home1/packages/m4/m4-1.4.7/share:$PATH - # Libtool is used to supply macros that aclocal uses - LIBTOOL=/home1/packages/libtool/libtool-1.5.14/bin/libtool -fi -# If we're on some other machine and automake et. al. aren't specified, guess -# that it's a Linux system connected to NCSA AFS. -# Someday this check could be smarter (e.g. check to make sure that -# 'autoconf' isn't the correct version before replacing it with this -# default. +# 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=/afs/ncsa/projects/hdf/packages/autoconf-2.60/bin/autoconf + AUTOCONF=/home1/packages/autoconf/autoconf-2.61/bin/autoconf fi if test -z ${AUTOMAKE}; then - AUTOMAKE=/afs/ncsa/projects/hdf/packages/automake-1.9.6/bin/automake-1.9 + AUTOMAKE=/home1/packages/automake/automake-1.10.0/bin/automake-1.10 fi if test -z ${AUTOHEADER}; then - AUTOHEADER=/afs/ncsa/projects/hdf/packages/autoconf-2.60/bin/autoheader + AUTOHEADER=/home1/packages/autoconf/autoconf-2.61/bin/autoheader fi if test -z ${ACLOCAL}; then - ACLOCAL=/afs/ncsa/projects/hdf/packages/automake-1.9.6/bin/aclocal-1.9 + ACLOCAL=/home1/packages/automake/automake-1.10.0/bin/aclocal-1.10 fi if test -z ${LIBTOOL}; then - LIBTOOL=/afs/ncsa/projects/hdf/packages/libtool_1.5.14/Linux_2.4/bin/libtool + LIBTOOL=/home1/packages/libtool/libtool-1.5.22/bin/libtool fi # Check version numbers of all autotools against the "correct" versions @@ -103,12 +83,13 @@ if test -z "${LT_VERS}"; then exit 1 fi -# Make sure that the tools are in the path. +# Use the latest version of M4 +PATH=/home1/packages/m4/m4-1.4.7/bin:/home1/packages/m4/m4-1.4.7/share:$PATH +# Make sure that the tools are in the path. AUTOCONF_DIR=`dirname ${AUTOCONF}` -PATH=${AUTOCONF_DIR}:$PATH - LIBTOOL_DIR=`dirname ${LIBTOOL}` +PATH=${AUTOCONF_DIR}:$PATH # Run autoconf/automake commands in order echo ${ACLOCAL} -I ${LIBTOOL_DIR}/../share/aclocal |