aboutsummaryrefslogtreecommitdiffstats
path: root/kbx
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 /kbx
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 'kbx')
-rw-r--r--kbx/ChangeLog5
-rw-r--r--kbx/Makefile.am2
2 files changed, 6 insertions, 1 deletions
diff --git a/kbx/ChangeLog b/kbx/ChangeLog
index bb1a38aa3..e83c265b3 100644
--- a/kbx/ChangeLog
+++ b/kbx/ChangeLog
@@ -1,3 +1,8 @@
+2007-01-25 Werner Koch <[email protected]>
+
+ * Makefile.am (kbxutil_LDADD): Added LIBICONV. Noted by Billy
+ Halsey.
+
2006-11-15 Werner Koch <[email protected]>
* kbxutil.c (dump_openpgp_key): Cast printf argument.
diff --git a/kbx/Makefile.am b/kbx/Makefile.am
index 2d9223bfe..92dd1e439 100644
--- a/kbx/Makefile.am
+++ b/kbx/Makefile.am
@@ -48,6 +48,6 @@ libkeybox_a_SOURCES = $(common_sources)
kbxutil_SOURCES = kbxutil.c $(common_sources)
kbxutil_LDADD = ../jnlib/libjnlib.a ../gl/libgnu.a \
$(KSBA_LIBS) $(LIBGCRYPT_LIBS) \
- -lgpg-error $(LIBINTL) ../common/libcommon.a
+ -lgpg-error $(LIBINTL) ../common/libcommon.a $(LIBICONV)
$(PROGRAMS) : ../jnlib/libjnlib.a ../gl/libgnu.a ../common/libcommon.a