[vlc-commits] Contribs: simplify gnutls rules

Jean-Baptiste Kempf git at videolan.org
Wed Mar 27 14:17:33 CET 2013


vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Wed Mar 27 14:17:19 2013 +0100| [0507661cfa1c539ebbbd0fc02002f57176d42382] | committer: Jean-Baptiste Kempf

Contribs: simplify gnutls rules

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

 contrib/src/gnutls/rules.mak |   16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/contrib/src/gnutls/rules.mak b/contrib/src/gnutls/rules.mak
index 7173091..ef04641 100644
--- a/contrib/src/gnutls/rules.mak
+++ b/contrib/src/gnutls/rules.mak
@@ -40,23 +40,7 @@ GNUTLS_CONF := \
 	--disable-guile \
 	$(HOSTCONF)
 
-USE_GCRYPT=0
-ifdef HAVE_WIN32
-USE_GCRYPT=0
-endif
-ifdef HAVE_MACOSX
-USE_GCRYPT=0
-endif
-ifdef HAVE_ANDROID
-USE_GCRYPT=0
-endif
-
-ifeq (1,$(USE_GCRYPT))
-GNUTLS_CONF += --with-libgcrypt
-DEPS_gnutls = gcrypt $(DEPS_gcrypt)
-else
 DEPS_gnutls = nettle $(DEPS_nettle)
-endif
 
 .gnutls: gnutls
 ifdef HAVE_ANDROID



More information about the vlc-commits mailing list