diff options
| author | David Shaw <[email protected]> | 2006-12-07 23:20:20 +0000 |
|---|---|---|
| committer | David Shaw <[email protected]> | 2006-12-07 23:20:20 +0000 |
| commit | 7b9eee1e5eed08fce2a6f2b6e75104f9d30a0edb (patch) | |
| tree | 496aab8a3895a8eeda1658dd59436bcee14e024e /agent | |
| parent | (no commit message) (diff) | |
| download | gnupg-7b9eee1e5eed08fce2a6f2b6e75104f9d30a0edb.tar.gz gnupg-7b9eee1e5eed08fce2a6f2b6e75104f9d30a0edb.zip | |
Makefile.am: Link to iconv for jnlib dependency. (OSX)
Diffstat (limited to 'agent')
| -rw-r--r-- | agent/ChangeLog | 4 | ||||
| -rw-r--r-- | agent/Makefile.am | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/agent/ChangeLog b/agent/ChangeLog index ddee4e5c6..2a14bda64 100644 --- a/agent/ChangeLog +++ b/agent/ChangeLog @@ -1,3 +1,7 @@ +2006-12-07 David Shaw <[email protected]> + + * Makefile.am: Link to iconv for jnlib dependency. + 2006-11-20 Werner Koch <[email protected]> * call-pinentry.c (agent_popup_message_stop): Use SIGKILL. diff --git a/agent/Makefile.am b/agent/Makefile.am index d8c56175f..6ec0068ca 100644 --- a/agent/Makefile.am +++ b/agent/Makefile.am @@ -53,7 +53,7 @@ pwquery_libs = ../common/libsimple-pwquery.a gpg_agent_CFLAGS = $(AM_CFLAGS) $(LIBASSUAN_PTH_CFLAGS) $(PTH_CFLAGS) gpg_agent_LDADD = $(commonpth_libs) \ $(LIBGCRYPT_LIBS) $(LIBASSUAN_PTH_LIBS) $(PTH_LIBS) \ - $(GPG_ERROR_LIBS) $(LIBINTL) $(NETLIBS) + $(GPG_ERROR_LIBS) $(LIBINTL) $(NETLIBS) $(LIBICONV) gpg_protect_tool_SOURCES = \ protect-tool.c \ @@ -62,14 +62,14 @@ gpg_protect_tool_SOURCES = \ # Needs $(NETLIBS) for libsimple-pwquery.la. gpg_protect_tool_LDADD = $(pwquery_libs) $(common_libs) \ - $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) $(LIBINTL) $(NETLIBS) + $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) $(LIBINTL) $(NETLIBS) $(LIBICONV) gpg_preset_passphrase_SOURCES = \ preset-passphrase.c # Needs $(NETLIBS) for libsimple-pwquery.la. gpg_preset_passphrase_LDADD = $(pwquery_libs) $(common_libs) \ - $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) $(LIBINTL) $(NETLIBS) + $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) $(LIBINTL) $(NETLIBS) $(LIBICONV) # Make sure that all libs are build before we use them. This is |