summaryrefslogtreecommitdiffstats
path: root/common
diff options
context:
space:
mode:
authorWerner Koch <wk@gnupg.org>2007-01-31 15:24:41 +0100
committerWerner Koch <wk@gnupg.org>2007-01-31 15:24:41 +0100
commitb861561e4791244a21fc118ec45f4c6afe71044b (patch)
treeb88c2c6f95cca85116747b3e746f0d765b622c2a /common
parentAdded LIBINTL to more Makefile targets. (diff)
downloadgnupg2-b861561e4791244a21fc118ec45f4c6afe71044b.tar.xz
gnupg2-b861561e4791244a21fc118ec45f4c6afe71044b.zip
Included LIBICONV in all Makefiles.
g10/ * passphrase.c (passphrase_get): Set the cancel flag on all error from the agent. Fixes a bug reported by Tom Duerbusch. sm/ * gpgsm.c (main): Let --gen-key print a more informative error message.
Diffstat (limited to 'common')
-rw-r--r--common/ChangeLog4
-rw-r--r--common/Makefile.am2
2 files changed, 5 insertions, 1 deletions
diff --git a/common/ChangeLog b/common/ChangeLog
index 5369d9f32..aa221f1ee 100644
--- a/common/ChangeLog
+++ b/common/ChangeLog
@@ -1,3 +1,7 @@
+2007-01-31 Werner Koch <wk@g10code.com>
+
+ * Makefile.am (t_common_ldadd): Add LIBINCONV and LIBINTL.
+
2007-01-25 Werner Koch <wk@g10code.com>
* simple-pwquery.c (simple_pwquery): New arg OPT_CHECK.
diff --git a/common/Makefile.am b/common/Makefile.am
index f2b28c45c..a0b27a12c 100644
--- a/common/Makefile.am
+++ b/common/Makefile.am
@@ -79,7 +79,7 @@ libgpgrl_a_SOURCES = \
module_tests = t-convert
t_common_ldadd = ../jnlib/libjnlib.a ../common/libcommon.a ../gl/libgnu.a \
- $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS)
+ $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) $(LIBINTL) $(LIBICONV)
t_convert_DEPENDENCIES = convert.c libcommon.a
t_convert_LDADD = $(t_common_ldadd)