From: Nikos Mavrogiannopoulos <nmav@gnutls.org>
Date: Wed, 13 Apr 2011 18:00:20 +0000 (+0200)
Subject: Added readme about pakchois and removed checks
X-Git-Tag: gnutls_2_99_1~40
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=375422f30662e79d70c9d2bb85c8c0697ca59226;p=thirdparty%2Fgnutls.git

Added readme about pakchois and removed checks
for pakchois in Makefile.am.
---

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 982ae6ea48..cf9bf8ca69 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -23,6 +23,7 @@
 
 ACLOCAL_AMFLAGS = -I ../m4 -I ../gl/m4
 
+EXTRA_DIST = pakchois/README
 SUBDIRS = includes x509 accelerated
 if ENABLE_MINITASN1
 SUBDIRS += minitasn1
@@ -106,10 +107,8 @@ HFILES = abstract_int.h debug.h gnutls_compress.h gnutls_cipher.h	\
 	ext_safe_renegotiation.h locks.h gnutls_mbuffers.h pkcs11_int.h \
 	hash.h
 
-if ENABLE_LOCAL_PAKCHOIS
 COBJECTS+=pakchois/pakchois.c pakchois/errors.c pakchois/dlopen.c
 HFILES+=pakchois/pakchois.h pakchois/pakchois11.h pakchois/dlopen.h
-endif
 
 # Separate so we can create the documentation
 
@@ -141,8 +140,6 @@ else
 libgnutls_la_LDFLAGS += $(LTLIBTASN1)
 endif
 
-libgnutls_la_LDFLAGS += $(LTLIBPAKCHOIS)
-
 if ENABLE_NETTLE
 libgnutls_la_LDFLAGS += $(LTLIBNETTLE) $(NETTLE_LIBS)
 libgnutls_la_LIBADD += nettle/libcrypto.la
diff --git a/lib/pakchois/README b/lib/pakchois/README
new file mode 100644
index 0000000000..1d582fdade
--- /dev/null
+++ b/lib/pakchois/README
@@ -0,0 +1,3 @@
+The pakchois library is not part of the GnuTLS library, but is used with
+GnuTLS. Pakchois was written by Joe Orton and is under the Lesser GPL license.
+