aboutsummaryrefslogtreecommitdiffstats
path: root/scd
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>2007-01-30 20:16:28 +0000
committerWerner Koch <[email protected]>2007-01-30 20:16:28 +0000
commit7eec2efa66b55eab51e20d0fcc606763081d0024 (patch)
tree87dae67ea711626b9831caa374a3763ce2b7bf14 /scd
parentjnlib/ (diff)
downloadgnupg-7eec2efa66b55eab51e20d0fcc606763081d0024.tar.gz
gnupg-7eec2efa66b55eab51e20d0fcc606763081d0024.zip
Added LIBINTL to more Makefile targets.
doc/ * com-certs.pem: Added the current root certifcates of D-Trust and S-Trust. g10/ * status.c (write_status_begin_signing): New. * sign.c (sign_file, sign_symencrypt_file): Call it. * textfilter.c (copy_clearsig_text): Call it. * call-agent.c (agent_scd_pksign): Pass --hash-rmd160 to SCD if required. * gpg.c (main): Let --no-use-agent and --gpg-agent-info print a warning. * misc.c (obsolete_option): New.
Diffstat (limited to 'scd')
-rw-r--r--scd/ChangeLog5
-rw-r--r--scd/Makefile.am3
2 files changed, 7 insertions, 1 deletions
diff --git a/scd/ChangeLog b/scd/ChangeLog
index 6d71dc110..9c6900117 100644
--- a/scd/ChangeLog
+++ b/scd/ChangeLog
@@ -1,3 +1,8 @@
+2007-01-25 Werner Koch <[email protected]>
+
+ * Makefile.am (scdaemon_LDADD): Added LIBICONV. Noted by Billy
+ Halsey.
+
2006-12-21 Werner Koch <[email protected]>
* app-openpgp.c (verify_chv2): Factored most code out into...
diff --git a/scd/Makefile.am b/scd/Makefile.am
index 405a611a5..448211623 100644
--- a/scd/Makefile.am
+++ b/scd/Makefile.am
@@ -46,7 +46,8 @@ scdaemon_SOURCES = \
scdaemon_LDADD = ../jnlib/libjnlib.a ../common/libcommonpth.a ../gl/libgnu.a \
$(LIBGCRYPT_LIBS) $(KSBA_LIBS) $(LIBASSUAN_PTH_LIBS) $(PTH_LIBS) \
- $(LIBUSB_LIBS) $(GPG_ERROR_LIBS) $(LIBINTL) $(DL_LIBS) $(NETLIBS)
+ $(LIBUSB_LIBS) $(GPG_ERROR_LIBS) \
+ $(LIBINTL) $(DL_LIBS) $(NETLIBS) $(LIBICONV)
# Removed for now: We need to decide whether it makes sense to
# continue it at all, given that gpg has now all required