diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2014-03-31 17:07:05 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2014-03-31 17:07:05 (GMT) |
| commit | c6fe8c70b2cdefed020248a6b6bbd25af5cebdf1 (patch) | |
| tree | 50f4975547d4fc4f033889038f5f49bd21ddbc5e /bin/reconfigure | |
| parent | cf482acf5528de3ac64b95bc9ff090c9b4b2a654 (diff) | |
| download | hdf5-c6fe8c70b2cdefed020248a6b6bbd25af5cebdf1.zip hdf5-c6fe8c70b2cdefed020248a6b6bbd25af5cebdf1.tar.gz hdf5-c6fe8c70b2cdefed020248a6b6bbd25af5cebdf1.tar.bz2 | |
[svn-r24932] HDFFV-8290: Remove unnecessary $(srcdir) and use AM_CPPFLAGS instead of INCLUDES. Update automake to 1.14.1
h5committest
Diffstat (limited to 'bin/reconfigure')
| -rwxr-xr-x | bin/reconfigure | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/bin/reconfigure b/bin/reconfigure index dba5a67..570f06e 100755 --- a/bin/reconfigure +++ b/bin/reconfigure @@ -29,9 +29,9 @@ # HDF5 currently uses the following versions of the autotools: AUTOCONF_VERSION="autoconf (GNU Autoconf) 2.69" -AUTOMAKE_VERSION="automake (GNU automake) 1.12.3" +AUTOMAKE_VERSION="automake (GNU automake) 1.14.1" AUTOHEADER_VERSION="autoheader (GNU Autoconf) 2.69" -ACLOCAL_VERSION="aclocal (GNU automake) 1.12.3" +ACLOCAL_VERSION="aclocal (GNU automake) 1.14.1" LIBTOOL_VERSION="(GNU libtool) 2.4.2" M4_VERSION="m4 (GNU M4) 1.4.16" @@ -42,17 +42,20 @@ M4_VERSION="m4 (GNU M4) 1.4.16" # If paths to autotools are not specified by the user, assume tools are # running on jam in /mnt/hdf/packages and set paths accordingly. +if test -z ${AUTORECONF}; then + AUTORECONF=/mnt/hdf/packages/autoconf/autoconf-2.69/bin/autoreconf +fi if test -z ${AUTOCONF}; then AUTOCONF=/mnt/hdf/packages/autoconf/autoconf-2.69/bin/autoconf fi if test -z ${AUTOMAKE}; then - AUTOMAKE=/mnt/hdf/packages/automake/automake-1.12.3/bin/automake-1.12 + AUTOMAKE=/mnt/hdf/packages/automake/automake-1.14.1/bin/automake-1.14 fi if test -z ${AUTOHEADER}; then AUTOHEADER=/mnt/hdf/packages/autoconf/autoconf-2.69/bin/autoheader fi if test -z ${ACLOCAL}; then - ACLOCAL=/mnt/hdf/packages/automake/automake-1.12.3/bin/aclocal-1.12 + ACLOCAL=/mnt/hdf/packages/automake/automake-1.14.1/bin/aclocal-1.14 fi if test -z ${LIBTOOL}; then LIBTOOL=/mnt/hdf/packages/libtool/libtool-2.4.2/bin/libtool |