diff options
| author | Satish Balay <balay@mcs.anl.gov> | 2024-01-13 01:43:40 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-13 01:43:40 (GMT) |
| commit | b72cc4f7f4efead63c3a2582ce472ce8a5b5b0ae (patch) | |
| tree | 3b1fa968772cbff6c593f7e915bb90f06ae0485f | |
| parent | 5f5f5f030ed6fff758ebddc0a007652e2c70c186 (diff) | |
| download | hdf5-b72cc4f7f4efead63c3a2582ce472ce8a5b5b0ae.zip hdf5-b72cc4f7f4efead63c3a2582ce472ce8a5b5b0ae.tar.gz hdf5-b72cc4f7f4efead63c3a2582ce472ce8a5b5b0ae.tar.bz2 | |
autogen.sh: check directly for libtoolize instead of libtool [as libtool is not used here] (#3886)
* autogen.sh: check directly for libtoolize instead of libtool [as libtool is not used here]
* autogen.sh: simplify (g)libtoolize check - look for glibtoolize first - and then libtoolize
| -rwxr-xr-x | autogen.sh | 36 |
1 files changed, 8 insertions, 28 deletions
@@ -44,7 +44,7 @@ # HDF5_AUTOHEADER # HDF5_AUTOMAKE # HDF5_AUTOCONF -# HDF5_LIBTOOL +# HDF5_LIBTOOLIZE # HDF5_M4 # # Note that aclocal will attempt to include libtool's share/aclocal @@ -111,16 +111,12 @@ 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 +if test -z "${HDF5_LIBTOOLIZE}"; then + # check for glibtoolize (likely found on MacOS). If not found - check for libtoolize + HDF5_LIBTOOLIZE="$(command -v glibtoolize)" + if [ ! -f "$HDF5_LIBTOOLIZE" ] ; then + HDF5_LIBTOOLIZE="$(command -v libtoolize)" + fi fi if test -z "${HDF5_M4}"; then HDF5_M4="$(command -v m4)" @@ -129,26 +125,10 @@ fi # Make sure that these versions of the autotools are in the path AUTOCONF_DIR=$(dirname "${HDF5_AUTOCONF}") -LIBTOOL_DIR=$(dirname "${HDF5_LIBTOOL}") +LIBTOOL_DIR=$(dirname "${HDF5_LIBTOOLIZE}") 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 |