From: Nikos Mavrogiannopoulos <redacted>
Date: Fri, 20 Jun 2014 15:31:32 +0000 (+0200)
Subject: gnutls: Added configuration option to use external libtasn1
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=82d693b82b6ff8ccdc0569f85aea4a09c24b4c98;p=openwrt-packages.git

gnutls: Added configuration option to use external libtasn1

Signed-off-by: Nikos Mavrogiannopoulos <redacted>
---

diff --git a/libs/gnutls/Config.in b/libs/gnutls/Config.in
index d55743f5a..b2f25746c 100644
--- a/libs/gnutls/Config.in
+++ b/libs/gnutls/Config.in
@@ -31,4 +31,8 @@ config GNUTLS_PSK
 config GNUTLS_ANON
 	bool "enable anonymous authentication support"
 
+config GNUTLS_EXT_LIBTASN1
+	bool "use external libtasn1"
+	default n
+
 endmenu
diff --git a/libs/gnutls/Makefile b/libs/gnutls/Makefile
index c178415fc..46e018776 100644
--- a/libs/gnutls/Makefile
+++ b/libs/gnutls/Makefile
@@ -75,7 +75,7 @@ endef
 define Package/libgnutls
 $(call Package/gnutls/Default)
   TITLE+= (library)
-  DEPENDS+= +libnettle +!LIBNETTLE_MINI:libgmp
+  DEPENDS+= +libnettle +!LIBNETTLE_MINI:libgmp +GNUTLS_EXT_LIBTASN1:libtasn1
 endef
 
 define Package/libgnutls/description
@@ -102,7 +102,6 @@ CONFIGURE_ARGS+= \
 	--disable-guile \
 	--disable-nls \
 	--without-zlib \
-	--with-included-libtasn1 \
 	--enable-local-libopts \
 	--disable-doc \
 	--disable-tests \
@@ -110,6 +109,10 @@ CONFIGURE_ARGS+= \
 	--disable-crywrap \
 	--without-p11-kit
 
+ifneq ($(CONFIG_GNUTLS_EXT_LIBTASN1),y)
+CONFIGURE_ARGS += --with-included-libtasn1
+endif
+
 ifeq ($(CONFIG_LIBNETTLE_MINI),y)
 CONFIGURE_ARGS += --with-nettle-mini
 endif