gnutls: Added configuration option to use external libtasn1

Signed-off-by: Nikos Mavrogiannopoulos <nmav@gnutls.org>

diff --git a/libs/gnutls/Config.in b/libs/gnutls/Config.in
index d55743f5a6f21fd8b9517c1f3b73a33be9350237..b2f25746c3cce1046a9b6cd5fcd6a363d0f4f77f 100644 (file)
--- 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 c178415fc35c5ea383b610b4de12afaee342bce9..46e018776123ab0aa12d2c135c459f04c83a23bf 100644 (file)
--- 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