diff options
Diffstat (limited to 'g10')
| -rw-r--r-- | g10/ChangeLog | 4 | ||||
| -rw-r--r-- | g10/Makefile.am | 6 |
2 files changed, 8 insertions, 2 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog index ed5b39947..4bc6b630d 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,3 +1,7 @@ +2006-12-07 David Shaw <[email protected]> + + * Makefile.am: Link to iconv for jnlib dependency. + 2006-12-05 Werner Koch <[email protected]> * passphrase.c (passphrase_to_dek): Handle a Cancel request diff --git a/g10/Makefile.am b/g10/Makefile.am index a38e03bab..c3e5432e3 100644 --- a/g10/Makefile.am +++ b/g10/Makefile.am @@ -118,8 +118,10 @@ gpgv2_SOURCES = gpgv.c \ LDADD = $(needed_libs) ../common/libgpgrl.a \ $(ZLIBS) $(DNSLIBS) $(LIBREADLINE) \ $(LIBINTL) $(CAPLIBS) $(NETLIBS) -gpg2_LDADD = $(LIBGCRYPT_LIBS) $(LDADD) $(LIBASSUAN_LIBS) $(GPG_ERROR_LIBS) -gpgv2_LDADD = $(LIBGCRYPT_LIBS) $(LDADD) $(LIBASSUAN_LIBS) $(GPG_ERROR_LIBS) +gpg2_LDADD = $(LIBGCRYPT_LIBS) $(LDADD) $(LIBASSUAN_LIBS) $(GPG_ERROR_LIBS) \ + $(LIBICONV) +gpgv2_LDADD = $(LIBGCRYPT_LIBS) $(LDADD) $(LIBASSUAN_LIBS) $(GPG_ERROR_LIBS) \ + $(LIBICONV) $(PROGRAMS): $(needed_libs) ../common/libgpgrl.a |