[vlc-commits] contribs/gnutls: disable on iOS

David Fuhrmann git at videolan.org
Tue Dec 31 15:00:13 CET 2013


vlc/vlc-2.1 | branch: master | David Fuhrmann <david.fuhrmann at googlemail.com> | Mon Dec 30 23:11:01 2013 +0100| [de6bd75898e7fd170dcf34bf027ae001a3bc2503] | committer: Felix Paul Kühne

contribs/gnutls: disable on iOS

(cherry picked from commit e453aec19f4dd03246ff551a1a4b50a812044ddd)
Signed-off-by: Felix Paul Kühne <fkuehne at videolan.org>

Conflicts:
	contrib/src/gnutls/rules.mak

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

 contrib/src/gnutls/rules.mak |    2 ++
 1 file changed, 2 insertions(+)

diff --git a/contrib/src/gnutls/rules.mak b/contrib/src/gnutls/rules.mak
index b7f1bed..189cb40 100644
--- a/contrib/src/gnutls/rules.mak
+++ b/contrib/src/gnutls/rules.mak
@@ -3,7 +3,9 @@
 GNUTLS_VERSION := 3.1.17
 GNUTLS_URL := ftp://ftp.gnutls.org/gcrypt/gnutls/v3.1/gnutls-$(GNUTLS_VERSION).tar.xz
 
+ifndef HAVE_IOS
 PKGS += gnutls
+endif
 ifeq ($(call need_pkg,"gnutls >= 3.0.20"),)
 PKGS_FOUND += gnutls
 endif



More information about the vlc-commits mailing list