From 11cf86bc73f9f415217f67e84d03d04d5600f932 Mon Sep 17 00:00:00 2001 From: Maarten Billemont Date: Sun, 24 Jun 2018 16:48:22 -0400 Subject: [PATCH] Use brew version of libtoolize. --- Brewfile | 1 + lib/bin/build_lib | 4 ++-- public/site | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Brewfile b/Brewfile index cb16d9ba..0ac547bb 100644 --- a/Brewfile +++ b/Brewfile @@ -1,5 +1,6 @@ brew "libsodium" brew "json-c" +brew "libtool" brew "automake" brew "autoconf" diff --git a/lib/bin/build_lib b/lib/bin/build_lib index ad77139d..e9c4027c 100755 --- a/lib/bin/build_lib +++ b/lib/bin/build_lib @@ -50,7 +50,7 @@ _initialize() { # # Check if all tools needed for the default implementations are available. # -# By default, this will check for `automake` (for aclocal) and `autoconf` (for autoreconf). +# By default, this will check for `libtool` (for libtoolize), `automake` (for aclocal) and `autoconf` (for autoreconf). initialize_needs() { _initialize_needs "$@"; } _initialize_needs() { if [[ $platform = windows ]]; then @@ -58,7 +58,7 @@ _initialize_needs() { export VSINSTALLDIR="${VSINSTALLDIR:-$(cd "$(cygpath -F 0x002a)/Microsoft Visual Studio"/*/*/Common7/.. && pwd)}" [[ -e "$VSINSTALLDIR/Common7/Tools/VsMSBuildCmd.bat" ]] || { echo >&2 "Missing: msbuild. Please install 'Build Tools for Visual Studio'."; return 1; } else - needs automake autoconf + needs libtool automake autoconf fi } diff --git a/public/site b/public/site index 979398a3..7421e1b0 160000 --- a/public/site +++ b/public/site @@ -1 +1 @@ -Subproject commit 979398a3259773344412d5d3cf8ef56afc0023ef +Subproject commit 7421e1b0a5c711e2e9ff827c21f8839e92b05e5a