diff options
Diffstat (limited to 'keyserver')
| -rw-r--r-- | keyserver/ChangeLog | 5 | ||||
| -rw-r--r-- | keyserver/Makefile.am | 6 |
2 files changed, 9 insertions, 2 deletions
diff --git a/keyserver/ChangeLog b/keyserver/ChangeLog index d2fd863f1..87fb3b241 100644 --- a/keyserver/ChangeLog +++ b/keyserver/ChangeLog @@ -1,3 +1,8 @@ +2009-09-02 Werner Koch <[email protected]> + + * Makefile.am (gpgkeys_curl_SOURCES, gpgkeys_ldap_SOURCES) + (gpgkeys_finger_SOURCES): Add ksmalloc.c only with non-faked cURL. + 2009-08-25 Werner Koch <[email protected]> * ksmalloc.c: New diff --git a/keyserver/Makefile.am b/keyserver/Makefile.am index 4c77a926c..1edf1e6d4 100644 --- a/keyserver/Makefile.am +++ b/keyserver/Makefile.am @@ -28,9 +28,9 @@ gpglibexec_SCRIPTS = @GPGKEYS_MAILTO@ noinst_SCRIPTS = gpgkeys_test gpgkeys_ldap_SOURCES = gpgkeys_ldap.c ksutil.c ksutil.h ksmalloc.c -gpgkeys_hkp_SOURCES = gpgkeys_hkp.c ksutil.c ksutil.h ksmalloc.c +gpgkeys_hkp_SOURCES = gpgkeys_hkp.c ksutil.c ksutil.h gpgkeys_finger_SOURCES = gpgkeys_finger.c ksutil.c ksutil.h -gpgkeys_curl_SOURCES = gpgkeys_curl.c ksutil.c ksutil.h ksmalloc.c +gpgkeys_curl_SOURCES = gpgkeys_curl.c ksutil.c ksutil.h other_libs = $(LIBICONV) $(LIBINTL) $(CAPLIBS) @@ -45,8 +45,10 @@ gpgkeys_curl_LDADD = ../util/libutil.a @NETLIBS@ @DNSLIBS@ $(other_libs) @GETOPT gpgkeys_hkp_SOURCES += curl-shim.c curl-shim.h gpgkeys_hkp_LDADD = ../util/libutil.a @NETLIBS@ @DNSLIBS@ $(other_libs) @GETOPT@ @W32LIBS@ else +gpgkeys_curl_SOURCES += ksmalloc.c gpgkeys_curl_CPPFLAGS = @LIBCURL_CPPFLAGS@ gpgkeys_curl_LDADD = ../util/libcompat.a @LIBCURL@ @GETOPT@ +gpgkeys_hkp_SOURCES += ksmalloc.c gpgkeys_hkp_CPPFLAGS = @LIBCURL_CPPFLAGS@ gpgkeys_hkp_LDADD = ../util/libcompat.a @DNSLIBS@ @LIBCURL@ @GETOPT@ gpgkeys_finger_CPPFLAGS = @LIBCURL_CPPFLAGS@ |