summaryrefslogtreecommitdiffstats
path: root/dirmngr
diff options
context:
space:
mode:
authorWerner Koch <wk@gnupg.org>2010-11-23 19:46:41 +0100
committerWerner Koch <wk@gnupg.org>2010-11-23 19:46:41 +0100
commitb3f9e2130e64e1a57d2b60444edf6f839c1a90b1 (patch)
treeec62e5100ce63278fcb3c743a19b7bcad85f51a7 /dirmngr
parent2010-11-17 Marcus Brinkmann <mb@g10code.com> (diff)
downloadgnupg2-b3f9e2130e64e1a57d2b60444edf6f839c1a90b1.tar.xz
gnupg2-b3f9e2130e64e1a57d2b60444edf6f839c1a90b1.zip
Change stack size for Wince.
Allow for a longer agent atartup under wince. Print gpg output via estream.
Diffstat (limited to 'dirmngr')
-rw-r--r--dirmngr/ChangeLog5
-rw-r--r--dirmngr/Makefile.am6
2 files changed, 9 insertions, 2 deletions
diff --git a/dirmngr/ChangeLog b/dirmngr/ChangeLog
index d1c768a53..d840ed43f 100644
--- a/dirmngr/ChangeLog
+++ b/dirmngr/ChangeLog
@@ -1,3 +1,8 @@
+2010-11-23 Werner Koch <wk@g10code.com>
+
+ * Makefile.am (dirmngr_LDFLAGS): Add extra_bin_ldflags.
+ (dirmngr_client_LDFLAGS): Ditto.
+
2010-10-21 Werner Koch <wk@g10code.com>
* dirmngr.c (main): Changed faked system time warning
diff --git a/dirmngr/Makefile.am b/dirmngr/Makefile.am
index 7e1ce9df6..5b1fe30be 100644
--- a/dirmngr/Makefile.am
+++ b/dirmngr/Makefile.am
@@ -63,7 +63,7 @@ dirmngr_LDADD = $(libcommonpth) ../gl/libgnu.a $(DNSLIBS) $(LIBASSUAN_LIBS) \
if !USE_LDAPWRAPPER
dirmngr_LDADD += $(LDAPLIBS)
endif
-
+dirmngr_LDFLAGS = $(extra_bin_ldflags)
if USE_LDAPWRAPPER
dirmngr_ldap_SOURCES = dirmngr_ldap.c $(ldap_url)
@@ -76,7 +76,9 @@ endif
dirmngr_client_SOURCES = dirmngr-client.c
dirmngr_client_LDADD = $(libcommon) no-libgcrypt.o \
../gl/libgnu.a $(LIBASSUAN_LIBS) \
- $(GPG_ERROR_LIBS) $(LIBINTL) $(LIBICONV)
+ $(GPG_ERROR_LIBS) $(LIBINTL) \
+ $(LIBICONV)
+dirmngr_client_LDFLAGS = $(extra_bin_ldflags)
no-libgcrypt.c : $(top_srcdir)/tools/no-libgcrypt.c