summaryrefslogtreecommitdiffstats
path: root/keyserver
diff options
context:
space:
mode:
authorWerner Koch <wk@gnupg.org>2006-11-23 10:53:17 +0100
committerWerner Koch <wk@gnupg.org>2006-11-23 10:53:17 +0100
commit218380395e1a97ffa4239f08cb397808ae8ea43f (patch)
treec35625f4c655202acc59289953584774e1baa34e /keyserver
parentFinal fix which should now pass all tests. (diff)
downloadgnupg2-218380395e1a97ffa4239f08cb397808ae8ea43f.tar.xz
gnupg2-218380395e1a97ffa4239f08cb397808ae8ea43f.zip
Preparing 2.0.1rc1
Diffstat (limited to 'keyserver')
-rw-r--r--keyserver/ChangeLog5
-rw-r--r--keyserver/Makefile.am2
2 files changed, 6 insertions, 1 deletions
diff --git a/keyserver/ChangeLog b/keyserver/ChangeLog
index 60ccb9544..2a1b95930 100644
--- a/keyserver/ChangeLog
+++ b/keyserver/ChangeLog
@@ -1,3 +1,8 @@
+2006-11-22 Werner Koch <wk@g10code.com>
+
+ * Makefile.am (gpg2keys_ldap_LDADD): Add jnlib. This is needed
+ for some replacement functions.
+
2006-11-21 Werner Koch <wk@g10code.com>
* curl-shim.c (curl_easy_perform): Made BUFLEN and MAXLNE a size_t.
diff --git a/keyserver/Makefile.am b/keyserver/Makefile.am
index c26bda383..2e9add011 100644
--- a/keyserver/Makefile.am
+++ b/keyserver/Makefile.am
@@ -41,7 +41,7 @@ other_libs = $(LIBICONV) $(LIBINTL) $(CAPLIBS)
gpg2keys_ldap_SOURCES = gpgkeys_ldap.c ksutil.c ksutil.h no-libgcrypt.c
gpg2keys_ldap_CPPFLAGS = $(LDAP_CPPFLAGS) $(AM_CPPFLAGS)
-gpg2keys_ldap_LDADD = $(LDAPLIBS) $(NETLIBS) $(other_libs)
+gpg2keys_ldap_LDADD = ../jnlib/libjnlib.a $(LDAPLIBS) $(NETLIBS) $(other_libs)
gpg2keys_finger_SOURCES = gpgkeys_finger.c ksutil.c ksutil.h no-libgcrypt.c
gpg2keys_finger_CPPFLAGS = $(AM_CPPFLAGS)