diff options
| author | Werner Koch <[email protected]> | 2007-01-31 14:24:41 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2007-01-31 14:24:41 +0000 |
| commit | b861561e4791244a21fc118ec45f4c6afe71044b (patch) | |
| tree | b88c2c6f95cca85116747b3e746f0d765b622c2a /tools | |
| parent | Added LIBINTL to more Makefile targets. (diff) | |
| download | gnupg-b861561e4791244a21fc118ec45f4c6afe71044b.tar.gz gnupg-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 'tools')
| -rw-r--r-- | tools/ChangeLog | 5 | ||||
| -rw-r--r-- | tools/Makefile.am | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/tools/ChangeLog b/tools/ChangeLog index 47e0a589b..0cfadae02 100644 --- a/tools/ChangeLog +++ b/tools/ChangeLog @@ -1,3 +1,8 @@ +2007-01-31 Werner Koch <[email protected]> + + * Makefile.am (symcryptrun_LDADD): Add LIBICONV. + (gpgkey2ssh_LDADD): Ditto. + 2006-12-13 David Shaw <[email protected]> * Makefile.am (gpgsplit_LDADD): Link to LIBINTL if we're using the diff --git a/tools/Makefile.am b/tools/Makefile.am index fd7f8a431..11abca701 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -68,7 +68,7 @@ gpgparsemail_LDADD = symcryptrun_SOURCES = symcryptrun.c symcryptrun_LDADD = $(LIBUTIL_LIBS) $(common_libs) $(pwquery_libs) \ - $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) $(LIBINTL) + $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) $(LIBINTL) $(LIBINCONV) watchgnupg_SOURCES = watchgnupg.c watchgnupg_LDADD = $(NETLIBS) @@ -82,7 +82,7 @@ gpgkey2ssh_CFLAGS = $(LIBGCRYPT_CFLAGS) $(GPG_ERROR_CFLAGS) # common sucks in jnlib, via use of BUG() in an inline function, which # some compilers do not eliminate. gpgkey2ssh_LDADD = $(common_libs) \ - $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) $(LIBINTL) + $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) $(LIBINTL) $(LIBICONV) # Make sure that all libs are build before we use them. This is |