[vlc-commits] contrib: disable libxml2 as needed

[Rémi Denis-Courmont]

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

contrib: disable libxml2 as needed

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

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

diff --git a/contrib/src/libxml2/rules.mak b/contrib/src/libxml2/rules.mak
index 3755f5c..8eae106 100644
--- a/contrib/src/libxml2/rules.mak
+++ b/contrib/src/libxml2/rules.mak
@@ -3,7 +3,7 @@
 LIBXML2_VERSION := 2.7.8
 LIBXML2_URL := http://xmlsoft.org/sources/libxml2-$(LIBXML2_VERSION).tar.gz
 
-PKGS += libxml2
+NEED_XML2 := $(call need_pkg,"libxml-2.0")
 
 $(TARBALLS)/libxml2-$(LIBXML2_VERSION).tar.gz:
 	$(call download,$(LIBXML2_URL))
@@ -17,9 +17,15 @@ libxml2: libxml2-$(LIBXML2_VERSION).tar.gz .sum-libxml2
 	mv $@-$(LIBXML2_VERSION) $@
 	touch $@
 
+ifeq ($(NEED_XML2),)
+.libxml2:
+else
+PKGS += libxml2
+
 .libxml2: libxml2
 	cd $< && $(HOSTVARS) ./configure $(HOSTCONF) CFLAGS="-DLIBXML_STATIC" $(XMLCONF)
 ifndef HAVE_MACOSX
 	cd $< && $(MAKE) install
 endif
+endif
 	touch $@