[vlc-devel] [PATCH v2 2/4] Fixed extras/tools libtool check on MacOS X.
Maxim Bublis
b at codemonkey.ru
Thu Nov 14 22:34:35 CET 2013
Patch has been updated. Added .glibtool target into tools.mak.
---
extras/tools/bootstrap | 12 +++++++++++-
extras/tools/tools.mak | 2 ++
2 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/extras/tools/bootstrap b/extras/tools/bootstrap
index 578d8e6..34f3691 100755
--- a/extras/tools/bootstrap
+++ b/extras/tools/bootstrap
@@ -54,10 +54,20 @@ else
fi
}
+LIBTOOL=
+case `uname` in
+ Darwin)
+ LIBTOOL=glibtool
+ ;;
+ *)
+ LIBTOOL=libtool
+ ;;
+esac
+
check autoconf 2.67
check automake 1.11
check m4 1.4.16
-check libtool 2.4
+check $LIBTOOL 2.4
check pkg-config
check cmake
check yasm
diff --git a/extras/tools/tools.mak b/extras/tools/tools.mak
index a009a60..23deb44 100644
--- a/extras/tools/tools.mak
+++ b/extras/tools/tools.mak
@@ -90,6 +90,8 @@ libtool: libtool-$(LIBTOOL_VERSION).tar.gz
ln -sf libtoolize $(PREFIX)/bin/glibtoolize
touch $@
+.glibtool: .libtool
+
CLEAN_PKG += libtool
DISTCLEAN_PKG += libtool-$(LIBTOOL_VERSION).tar.gz
CLEAN_FILE += .libtool
--
Maxim Bublis
More information about the vlc-devel
mailing list