[vlc-devel] commit: contribs: bootstrap dirac on Darwin, so we don' t need to update libtool ( Felix Paul Kühne )

[git version control]

vlc | branch: master | Felix Paul Kühne <fkuehne at videolan.org> | Tue Apr  7 18:09:50 2009 +0200| [17cbf681aeba9d0226fbde8fae8e52ba35b24097] | committer: Felix Paul Kühne 

contribs: bootstrap dirac on Darwin, so we don't need to update libtool

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=17cbf681aeba9d0226fbde8fae8e52ba35b24097
---

 extras/contrib/src/Makefile     |   11 ++++++++++-
 extras/contrib/src/packages.mak |    5 ++---
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 5ba1c2d..bc2a3bc 100644
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -2211,7 +2211,11 @@ ifdef HAVE_CYGWIN
 	# incorrect compile warning with cygwin compiler 3.4.4
 	patch -p0 <Patches/dirac-cygwin.patch
 endif
+ifndef HAVE_DARWIN_OS
 	(cd $@; aclocal -I m4 && autoconf && automake)
+else
+	(cd $@; ./bootstrap)
+endif
 
 DIRAC_SUBDIRS = libdirac_byteio libdirac_common libdirac_motionest libdirac_encoder libdirac_decoder
 
@@ -2486,7 +2490,12 @@ liboil: liboil-$(OIL_VERSION).tar.gz
 	$(EXTRACT_GZ)
 
 .liboil: liboil
-	(cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS) -O2" && make && make install)
+ifdef HAVE_DARWIN_OS
+	(cd $<; $(HOSTCC) ./configure $(HOSTCONF) --disable-glib --prefix=$(PREFIX) CFLAGS="$(CFLAGS) -O4")
+else
+	(cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS) -O2")
+endif
+	(cd $<; make && make install)
 	touch $@
 
 CLEAN_FILE += .liboil
diff --git a/extras/contrib/src/packages.mak b/extras/contrib/src/packages.mak
index 7da4b44..0b9f5e1 100644
--- a/extras/contrib/src/packages.mak
+++ b/extras/contrib/src/packages.mak
@@ -40,9 +40,8 @@ GNUMAKE_VERSION=3.81
 GNUMAKE_URL=$(GNU)/make/make-$(GNUMAKE_VERSION).tar.bz2
 CMAKE_VERSION=2.6.0
 CMAKE_URL=http://www.cmake.org/files/v2.6/cmake-$(CMAKE_VERSION).tar.gz
-LIBTOOL_VERSION=2.2.6
-#LIBTOOL_URL=$(GNU)/libtool/libtool-$(LIBTOOL_VERSION).tar.gz
-LIBTOOL_URL=$(VIDEOLAN)/testing/contrib/libtool-$(LIBTOOL_VERSION).tar.gz
+LIBTOOL_VERSION=1.5.26
+LIBTOOL_URL=$(GNU)/libtool/libtool-$(LIBTOOL_VERSION).tar.gz
 AUTOMAKE_VERSION=1.10.2
 AUTOMAKE_URL=$(GNU)/automake/automake-$(AUTOMAKE_VERSION).tar.gz
 PKGCFG_VERSION=0.20