From: Nikos Mavrogiannopoulos <nmav@gnutls.org>
Date: Mon, 1 Aug 2011 16:08:11 +0000 (+0200)
Subject: Refer to nettle alone and p11-kit.
X-Git-Tag: gnutls_3_0_1~15^2~44
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a7ece2ae178bb0c168d7e1537df06e7743ae134f;p=thirdparty%2Fgnutls.git

Refer to nettle alone and p11-kit.
---

diff --git a/README b/README
index 36c3f7808c..537f10f37e 100644
--- a/README
+++ b/README
@@ -34,16 +34,15 @@ and libgnutls-extra.a), the shared object (libgnutls.so  and
 libgnutls-extra.so), and additional binaries such as certtool and
 gnutls-cli.
 
-The library depends on libnettle OR libgcrypt (but never both).  GnuTLS
-currently uses libnettle as the default cryptographic library.  Versions
+The library depends on libnettle and p11-kit. Versions
 2.10.3 and prior used libgcrypt as the default cryptographic library.
 Nettle can be found at http://www.gnu.org/software/nettle/, while
-libgcrypt can be found at <ftp://ftp.gnupg.org/pub/gcrypt/libgcrypt/>.
+p11-kit can be found at <http://p11-glue.freedesktop.org/p11-kit.html>.
 
 To configure libnettle for installation and use by GnuTLS, a typical
 command sequence would be:
 
-    cd nettle-2.1
+    cd nettle-2.2
     ./configure --prefix=/usr --disable-openssl --enable-shared
     make
     sudo make install
diff --git a/README-alpha b/README-alpha
index 470f8fa9b7..69e970de66 100644
--- a/README-alpha
+++ b/README-alpha
@@ -26,6 +26,7 @@ We require several tools to build the software, including:
 - Guile <http://www.gnu.org/software/guile/>
 - Gaa <http://gaa.sf.net> (optional)
 - libtasn1 <http://josefsson.org/libtasn1/> (optional)
+- p11-kit <http://p11-glue.freedesktop.org/p11-kit.html>
 - datefudge <packages.debian.org/datefudge> (optional)
 
 The required software is typically distributed with your operating