[vlc-commits] contribs: disable freetype as needed

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Wed Jun 29 10:15:37 2011 +0300| [1ba383f67c565c29b36a83d766f01dde17921eb1] | committer: Rémi Denis-Courmont

contribs: disable freetype as needed

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

 contrib/src/freetype2/rules.mak |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/contrib/src/freetype2/rules.mak b/contrib/src/freetype2/rules.mak
index 0c38d7a..dce3e6d 100644
--- a/contrib/src/freetype2/rules.mak
+++ b/contrib/src/freetype2/rules.mak
@@ -3,7 +3,7 @@
 FREETYPE2_VERSION := 2.4.5
 FREETYPE2_URL := $(SF)/freetype/freetype-$(FREETYPE2_VERSION).tar.gz
 
-PKGS += freetype2
+NEED_FREETYPE2 := $(call need_pkg,"freetype2")
 
 $(TARBALLS)/freetype-$(FREETYPE2_VERSION).tar.gz:
 	$(call download,$(FREETYPE2_URL))
@@ -15,7 +15,13 @@ freetype: freetype-$(FREETYPE2_VERSION).tar.gz .sum-freetype2
 	mv $@-$(FREETYPE2_VERSION) $@
 	touch $@
 
+ifeq ($(NEED_FREETYPE2),)
+.freetype2:
+else
+PKGS += freetype2
+
 .freetype2: freetype
 	cd $< && $(HOSTVARS) ./configure $(HOSTCONF)
 	cd $< && $(MAKE) install
+endif
 	touch $@