summaryrefslogtreecommitdiffstats
path: root/keyserver
diff options
context:
space:
mode:
authorWerner Koch <wk@gnupg.org>2006-10-17 16:34:42 +0200
committerWerner Koch <wk@gnupg.org>2006-10-17 16:34:42 +0200
commitbe410be660305328787559a18b8c9b69790dbfe8 (patch)
tree32a7dd94b21d1973c1ceedc3d71e13df34f0c83b /keyserver
parentFixed aegypten bug 372 (diff)
downloadgnupg2-be410be660305328787559a18b8c9b69790dbfe8.tar.xz
gnupg2-be410be660305328787559a18b8c9b69790dbfe8.zip
Pth tweaks and improved estream.c
Diffstat (limited to 'keyserver')
-rw-r--r--keyserver/ChangeLog5
-rw-r--r--keyserver/Makefile.am8
2 files changed, 9 insertions, 4 deletions
diff --git a/keyserver/ChangeLog b/keyserver/ChangeLog
index 4e634e05e..a8f3f8956 100644
--- a/keyserver/ChangeLog
+++ b/keyserver/ChangeLog
@@ -1,3 +1,8 @@
+2006-10-17 Werner Koch <wk@g10code.com>
+
+ * Makefile.am: Removed W32LIBS as they are included in NETLIBS.
+ Removed PTH_LIBS.
+
2006-09-26 Werner Koch <wk@g10code.com>
* curl-shim.c: Adjusted for changes in http.c.
diff --git a/keyserver/Makefile.am b/keyserver/Makefile.am
index 5ad30782e..d72da1406 100644
--- a/keyserver/Makefile.am
+++ b/keyserver/Makefile.am
@@ -47,20 +47,20 @@ gpg2keys_curl_SOURCES = gpgkeys_curl.c ksutil.c ksutil.h no-libgcrypt.c
gpg2keys_ldap_CPPFLAGS = $(LDAP_CPPFLAGS) $(AM_CPPFLAGS)
gpg2keys_ldap_LDADD = $(LDAPLIBS) $(NETLIBS) \
- $(other_libs) $(W32LIBS)
+ $(other_libs)
gpg2keys_finger_LDADD = $(common_libs) $(LIBGCRYPT_LIBS) \
- $(NETLIBS) $(other_libs) $(W32LIBS)
+ $(NETLIBS) $(other_libs)
if FAKE_CURL
gpg2keys_curl_SOURCES += curl-shim.c curl-shim.h
gpg2keys_curl_CPPFLAGS = $(AM_CPPFLAGS)
gpg2keys_curl_LDADD = $(common_libs) $(GPG_ERROR_LIBS) $(NETLIBS) $(DNSLIBS) \
- $(other_libs) $(PTH_LIBS) $(W32LIBS)
+ $(other_libs)
gpg2keys_hkp_SOURCES += curl-shim.c curl-shim.h
gpg2keys_hkp_CPPFLAGS = $(AM_CPPFLAGS)
gpg2keys_hkp_LDADD = $(common_libs) $(GPG_ERROR_LIBS) $(NETLIBS) $(DNSLIBS) \
- $(other_libs) $(PTH_LIBS) $(W32LIBS)
+ $(other_libs)
else
gpg2keys_curl_CPPFLAGS = $(LIBCURL_CPPFLAGS) $(AM_CPPFLAGS)
gpg2keys_curl_LDADD = $(LIBCURL) $(GETOPT)