summaryrefslogtreecommitdiffstats
path: root/bin/reconfigure
diff options
context:
space:
mode:
authorAllen Byrne <byrn@hdfgroup.org>2012-08-28 19:11:34 (GMT)
committerAllen Byrne <byrn@hdfgroup.org>2012-08-28 19:11:34 (GMT)
commit612af6440b664bbd7888128ffacacb5cb9867b36 (patch)
tree38473f6e315f4aae607e3f1d23a50f55c5081fce /bin/reconfigure
parent0bc6398ec400c55b6ded5381d1c01bfb675589cb (diff)
downloadhdf5-612af6440b664bbd7888128ffacacb5cb9867b36.zip
hdf5-612af6440b664bbd7888128ffacacb5cb9867b36.tar.gz
hdf5-612af6440b664bbd7888128ffacacb5cb9867b36.tar.bz2
[svn-r22724] Convert tests to *.sh.in.
Convert configure.in to configure.ac. Align TESTS usage with autotools convention. Update all references from configure.in to configure.ac Tested: h5committest
Diffstat (limited to 'bin/reconfigure')
-rwxr-xr-xbin/reconfigure16
1 files changed, 12 insertions, 4 deletions
diff --git a/bin/reconfigure b/bin/reconfigure
index e176cfa..dba5a67 100755
--- a/bin/reconfigure
+++ b/bin/reconfigure
@@ -33,6 +33,8 @@ AUTOMAKE_VERSION="automake (GNU automake) 1.12.3"
AUTOHEADER_VERSION="autoheader (GNU Autoconf) 2.69"
ACLOCAL_VERSION="aclocal (GNU automake) 1.12.3"
LIBTOOL_VERSION="(GNU libtool) 2.4.2"
+M4_VERSION="m4 (GNU M4) 1.4.16"
+
#
# When upgrading automake's version, don't forget to also update its
# helper utilities, especially depcomp.
@@ -55,6 +57,9 @@ fi
if test -z ${LIBTOOL}; then
LIBTOOL=/mnt/hdf/packages/libtool/libtool-2.4.2/bin/libtool
fi
+if test -z ${M4}; then
+ M4=/mnt/hdf/packages/m4/m4-1.4.16/bin/m4
+fi
# Check version numbers of all autotools against the "correct" versions
AC_VERS=`${AUTOCONF} --version 2>&1 | grep "^${AUTOCONF_VERSION}"`
@@ -82,14 +87,17 @@ if test -z "${LT_VERS}"; then
echo "${LIBTOOL} version is not ${LIBTOOL_VERSION}"
exit 1
fi
-
-# Use the latest version of M4
-PATH=/mnt/hdf/packages/m4/m4-1.4.16/bin:/mnt/hdf/packages/m4/m4-1.4.16/share:$PATH
+M4_VERS=`${M4} --version 2>&1 | grep "${M4_VERSION}"`
+if test -z "${M4_VERS}"; then
+ echo "${M4} version is not ${M4_VERSION}"
+ exit 1
+fi
# Make sure that the tools are in the path.
AUTOCONF_DIR=`dirname ${AUTOCONF}`
LIBTOOL_DIR=`dirname ${LIBTOOL}`
-PATH=${AUTOCONF_DIR}:$PATH
+M4_DIR=`dirname ${M4}`
+PATH=${AUTOCONF_DIR}:${M4_DIR}:$PATH
# Run autoconf/automake commands in order
echo ${ACLOCAL} -I ${LIBTOOL_DIR}/../share/aclocal