summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xautogen.sh171
1 files changed, 6 insertions, 165 deletions
diff --git a/autogen.sh b/autogen.sh
index 7c3cbcf..7c7ab73 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -35,26 +35,6 @@
# tools. This autogen.sh script handles this for you.
#
# END IMPORTANT OS X NOTE
-#
-# If you want to use a particular version of the autotools, the paths
-# to each tool can be overridden using the following environment
-# variables:
-#
-# HDF5_ACLOCAL
-# HDF5_AUTOHEADER
-# HDF5_AUTOMAKE
-# HDF5_AUTOCONF
-# HDF5_LIBTOOL
-# HDF5_M4
-#
-# Note that aclocal will attempt to include libtool's share/aclocal
-# directory.
-#
-# Aside from -h for help, this script takes one potential option:
-#
-# -v
-#
-# This emits some extra information, mainly tool versions.
echo
echo "**************************"
@@ -62,93 +42,6 @@ echo "* HDF5 autogen.sh script *"
echo "**************************"
echo
-# Default is not verbose output
-verbose=false
-
-optspec=":hpv-"
-while getopts "$optspec" optchar; do
- case "${optchar}" in
- h)
- echo "usage: $0 [OPTIONS]"
- echo
- echo " -h Print this help message."
- echo
- echo " -v Show more verbose output."
- echo
- echo " NOTE: Each tool can be set via an environment variable."
- echo " These are documented inside this autogen.sh script."
- echo
- exit 0
- ;;
- v)
- echo "Setting verbosity: high"
- echo
- verbose=true
- ;;
- *)
- if [ "$OPTERR" != 1 ] || case $optspec in :*) ;; *) false; esac; then
- echo "ERROR: non-option argument: '-${OPTARG}'" >&2
- echo "Quitting"
- exit 1
- fi
- ;;
- esac
-done
-
-# If paths to autotools are not specified, use whatever the system
-# has installed as the default. We use 'command -v <tool>' to
-# show exactly what's being used (shellcheck complains that 'which'
-# is non-standard and deprecated).
-if test -z "${HDF5_AUTOCONF}"; then
- HDF5_AUTOCONF="$(command -v autoconf)"
-fi
-if test -z "${HDF5_AUTOMAKE}"; then
- HDF5_AUTOMAKE="$(command -v automake)"
-fi
-if test -z "${HDF5_AUTOHEADER}"; then
- HDF5_AUTOHEADER="$(command -v autoheader)"
-fi
-if test -z "${HDF5_ACLOCAL}"; then
- HDF5_ACLOCAL="$(command -v aclocal)"
-fi
-if test -z "${HDF5_LIBTOOL}"; then
- case "$(uname)" in
- Darwin*)
- # libtool on OS-X is non-gnu
- HDF5_LIBTOOL="$(command -v glibtool)"
- ;;
- *)
- HDF5_LIBTOOL="$(command -v libtool)"
- ;;
- esac
-fi
-if test -z "${HDF5_M4}"; then
- HDF5_M4="$(command -v m4)"
-fi
-
-
-# Make sure that these versions of the autotools are in the path
-AUTOCONF_DIR=$(dirname "${HDF5_AUTOCONF}")
-LIBTOOL_DIR=$(dirname "${HDF5_LIBTOOL}")
-M4_DIR=$(dirname "${HDF5_M4}")
-PATH=${AUTOCONF_DIR}:${LIBTOOL_DIR}:${M4_DIR}:$PATH
-
-# Make libtoolize match the specified libtool
-case "$(uname)" in
-Darwin*)
- # On OS X, libtoolize could be named glibtoolize or
- # libtoolize. Try the former first, then fall back
- # to the latter if it's not found.
- HDF5_LIBTOOLIZE="${LIBTOOL_DIR}/glibtoolize"
- if [ ! -f "$HDF5_LIBTOOLIZE" ] ; then
- HDF5_LIBTOOLIZE="${LIBTOOL_DIR}/libtoolize"
- fi
- ;;
-*)
- HDF5_LIBTOOLIZE="${LIBTOOL_DIR}/libtoolize"
- ;;
-esac
-
# Run scripts that process source.
#
# These should be run before the autotools so that failures here block
@@ -182,69 +75,17 @@ echo "Running overflow macro generation script:"
bin/make_overflow src/H5overflow.txt || exit 1
echo
-# Run autotools in order
-#
-# When available, we use the --force option to ensure all files are
-# updated. This prevents the autotools from re-running to fix dependencies
-# during the 'make' step, which can be a problem if environment variables
-# were set on the command line during autogen invocation.
-
-# Some versions of libtoolize will suggest that we add ACLOCAL_AMFLAGS
-# = '-I m4'. This is already done in commence.am, which is included
-# in Makefile.am. You can ignore this suggestion.
+# Run autotools
-# LIBTOOLIZE
-libtoolize_cmd="${HDF5_LIBTOOLIZE} --copy --force"
-echo "${libtoolize_cmd}"
-if [ "$verbose" = true ] ; then
- ${HDF5_LIBTOOLIZE} --version
-fi
-${libtoolize_cmd} || exit 1
+# The "obsolete" warnings category flags our Java macros as obsolete.
+# Since there is no clear way to upgrade them (Java support in the Autotools
+# is not great) and they work well enough for now, we suppress those warnings.
+echo "Running Autotools"
echo
echo "NOTE: You can ignore the warning about adding -I m4."
echo " We already do this in an included file."
echo
-
-# ACLOCAL
-if test -e "${LIBTOOL_DIR}/../share/aclocal" ; then
- aclocal_include="-I ${LIBTOOL_DIR}/../share/aclocal"
-fi
-aclocal_cmd="${HDF5_ACLOCAL} --force -I m4 ${aclocal_include}"
-echo "${aclocal_cmd}"
-if [ "$verbose" = true ] ; then
- ${HDF5_ACLOCAL} --version
-fi
-${aclocal_cmd} || exit 1
-echo
-
-# AUTOHEADER
-autoheader_cmd="${HDF5_AUTOHEADER} --force"
-echo "${autoheader_cmd}"
-if [ "$verbose" = true ] ; then
- ${HDF5_AUTOHEADER} --version
-fi
-${autoheader_cmd} || exit 1
-echo
-
-# AUTOMAKE
-automake_cmd="${HDF5_AUTOMAKE} --copy --add-missing --force-missing"
-echo "${automake_cmd}"
-if [ "$verbose" = true ] ; then
- ${HDF5_AUTOMAKE} --version
-fi
-${automake_cmd} || exit 1
-echo
-
-# AUTOCONF
-# The "obsolete" warnings category flags our Java macros as obsolete.
-# Since there is no clear way to upgrade them (Java support in the Autotools
-# is not great) and they work well enough for now, we suppress those warnings.
-autoconf_cmd="${HDF5_AUTOCONF} --force --warnings=no-obsolete"
-echo "${autoconf_cmd}"
-if [ "$verbose" = true ] ; then
- ${HDF5_AUTOCONF} --version
-fi
-${autoconf_cmd} || exit 1
+autoreconf -vif --warnings=no-obsolete || exit 1
echo
echo "*** SUCCESS ***"