gnutls: Added configuration option to use external libtasn1

Signed-off-by: Nikos Mavrogiannopoulos <nmav@gnutls.org>
This commit is contained in:
Nikos Mavrogiannopoulos 2014-06-20 17:31:32 +02:00
parent 3a025deb84
commit 82d693b82b
2 changed files with 9 additions and 2 deletions

View file

@ -31,4 +31,8 @@ config GNUTLS_PSK
config GNUTLS_ANON config GNUTLS_ANON
bool "enable anonymous authentication support" bool "enable anonymous authentication support"
config GNUTLS_EXT_LIBTASN1
bool "use external libtasn1"
default n
endmenu endmenu

View file

@ -75,7 +75,7 @@ endef
define Package/libgnutls define Package/libgnutls
$(call Package/gnutls/Default) $(call Package/gnutls/Default)
TITLE+= (library) TITLE+= (library)
DEPENDS+= +libnettle +!LIBNETTLE_MINI:libgmp DEPENDS+= +libnettle +!LIBNETTLE_MINI:libgmp +GNUTLS_EXT_LIBTASN1:libtasn1
endef endef
define Package/libgnutls/description define Package/libgnutls/description
@ -102,7 +102,6 @@ CONFIGURE_ARGS+= \
--disable-guile \ --disable-guile \
--disable-nls \ --disable-nls \
--without-zlib \ --without-zlib \
--with-included-libtasn1 \
--enable-local-libopts \ --enable-local-libopts \
--disable-doc \ --disable-doc \
--disable-tests \ --disable-tests \
@ -110,6 +109,10 @@ CONFIGURE_ARGS+= \
--disable-crywrap \ --disable-crywrap \
--without-p11-kit --without-p11-kit
ifneq ($(CONFIG_GNUTLS_EXT_LIBTASN1),y)
CONFIGURE_ARGS += --with-included-libtasn1
endif
ifeq ($(CONFIG_LIBNETTLE_MINI),y) ifeq ($(CONFIG_LIBNETTLE_MINI),y)
CONFIGURE_ARGS += --with-nettle-mini CONFIGURE_ARGS += --with-nettle-mini
endif endif