Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

autogen.sh: check directly for libtoolize instead of libtool [as libtool is not used here] #3886

Merged
merged 2 commits into from
Jan 13, 2024
Merged

autogen.sh: check directly for libtoolize instead of libtool [as libtool is not used here] #3886

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d86cb0d
autogen.sh: check directly for libtoolize instead of libtool [as libt…
balay Dec 4, 2023
21d273a
autogen.sh: simplify (g)libtoolize check - look for glibtoolize first…
balay Jan 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 8 additions & 28 deletions autogen.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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)"
Expand All @@ -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
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why are you removing the MacOS hack?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure I understand.

MacOS hack is already at line 116 above.

My change is removing the redirection from "libtool" to "libtoolize/glibtoolize" - i.e why not look directly for libtoolize/glibtoolize [as libtool is not really used in this script - only libtoolize/glibtoolize is used]?

My build on MacOS goes through fine with this PR change

balay@mpro git.hdf5 % sw_vers              
ProductName:		macOS
ProductVersion:		14.1.2
BuildVersion:		23B92
balay@mpro git.hdf5 % which libtool        
/usr/bin/libtool
balay@mpro git.hdf5 % which libtoolize     
libtoolize not found
balay@mpro git.hdf5 % which glibtool       
/opt/homebrew/bin/glibtool
balay@mpro git.hdf5 % which glibtoolize    
/opt/homebrew/bin/glibtoolize
balay@mpro git.hdf5 % git show -q --oneline
d86cb0da314 (HEAD) autogen.sh: check directly for libtoolize instead of libtool [as libtool is not used here]
balay@mpro git.hdf5 % ./autogen.sh 

**************************
* HDF5 autogen.sh script *
**************************

Running trace script:
Finished processing HDF5 API calls:
	instrumented 0 API functions and 0 argument lists

Running error generation script:
Generating 'H5Epubgen.h'
Generating 'H5Einit.h'
Generating 'H5Eterm.h'
Generating 'H5Edefin.h'

Running API version generation script:
Generating 'H5version.h'

Running overflow macro generation script:
Generating 'H5overflow.h'

/opt/homebrew/bin/glibtoolize --copy --force
glibtoolize: putting auxiliary files in AC_CONFIG_AUX_DIR, 'bin'.
glibtoolize: copying file 'bin/ltmain.sh'
glibtoolize: putting macros in AC_CONFIG_MACRO_DIRS, 'm4'.
glibtoolize: copying file 'm4/libtool.m4'
glibtoolize: copying file 'm4/ltoptions.m4'
glibtoolize: copying file 'm4/ltsugar.m4'
glibtoolize: copying file 'm4/ltversion.m4'
glibtoolize: copying file 'm4/lt~obsolete.m4'
glibtoolize: Consider adding '-I m4' to ACLOCAL_AMFLAGS in Makefile.am.

NOTE: You can ignore the warning about adding -I m4.
      We already do this in an included file.

/opt/homebrew/bin/aclocal --force -I m4 -I /opt/homebrew/bin/../share/aclocal

/opt/homebrew/bin/autoheader --force

/opt/homebrew/bin/automake --copy --add-missing --force-missing
configure.ac:506: installing 'bin/compile'
configure.ac:136: installing 'bin/config.guess'
configure.ac:136: installing 'bin/config.sub'
configure.ac:35: installing 'bin/install-sh'
configure.ac:35: installing 'bin/missing'
parallel-tests: installing 'bin/test-driver'
c++/src/Makefile.am: installing 'bin/depcomp'

/opt/homebrew/bin/autoconf --force --warnings=no-obsolete

*** SUCCESS ***

balay@mpro git.hdf5 %

Or perhaps I don't know the use case - where the build breaks without this extra re-direction [from libtool to libtoolize]

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Checking if there are any issues to resolve before this PR can be merged!

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry - I didn't see that since I was looking at the PR on my phone.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The previous MacOS code would check for both glibtoolize and libtoolize, but this change makes it only check for glibtoolize. If it's working, great, let's simplify, but it might need the previous hack if other devs need libtoolize instead of glibtoolize on the Mac.


# Run scripts that process source.
#
# These should be run before the autotools so that failures here block
Expand Down