From: Nikos Mavrogiannopoulos <nmav@gnutls.org>
Date: Tue, 25 Sep 2012 15:22:09 +0000 (+0200)
Subject: updated cross.mk
X-Git-Tag: gnutls_3_1_2~4
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=931db698efcf6570df64f97f93f857bb0eae8a10;p=thirdparty%2Fgnutls.git

updated cross.mk
---

diff --git a/cross.mk b/cross.mk
index 0c569de3c3..6dab590d88 100644
--- a/cross.mk
+++ b/cross.mk
@@ -1,12 +1,12 @@
-GNUTLS_VERSION:=3.1.1
+GNUTLS_VERSION:=3.1.2
 GNUTLS_FILE:=gnutls-$(GNUTLS_VERSION).tar.xz
 GNUTLS_DIR:=gnutls-$(GNUTLS_VERSION)
 
 GMP_FILE:=gmp-5.0.5.tar.bz2
 GMP_DIR:=gmp-5.0.5
 
-P11_KIT_FILE:=p11-kit-0.13.tar.gz
-P11_KIT_DIR:=p11-kit-0.13
+P11_KIT_FILE:=p11-kit-0.14.tar.gz
+P11_KIT_DIR:=p11-kit-0.14
 
 NETTLE_FILE:=nettle-2.5.tar.gz
 NETTLE_DIR:=nettle-2.5
@@ -119,7 +119,7 @@ $(GNUTLS_DIR)/.configured: $(NETTLE_DIR)/.installed $(P11_KIT_DIR)/.installed
 		P11_KIT_LIBS="$(LIB_DIR)/libp11-kit.la" \
 		LDFLAGS="-L$(LIB_DIR)" CFLAGS="-I$(HEADERS_DIR)" CXXFLAGS="-I$(HEADERS_DIR)" \
 		./configure $(CONFIG_FLAGS) --enable-local-libopts --with-libnettle-prefix=$(LIB_DIR) \
-		--disable-openssl-compatibility && cd ..
+		--disable-openssl-compatibility --with-included-libtasn1 && cd ..
 	touch $@
 
 clean: