Makefile.am: Link to iconv for jnlib dependency. (OSX)
authorDavid Shaw <dshaw@jabberwocky.com>
Thu, 7 Dec 2006 23:20:20 +0000 (23:20 +0000)
committerDavid Shaw <dshaw@jabberwocky.com>
Thu, 7 Dec 2006 23:20:20 +0000 (23:20 +0000)
agent/ChangeLog
agent/Makefile.am
g10/ChangeLog
g10/Makefile.am
tools/ChangeLog
tools/Makefile.am

index ddee4e5..2a14bda 100644 (file)
@@ -1,3 +1,7 @@
+2006-12-07  David Shaw  <dshaw@jabberwocky.com>
+
+       * Makefile.am: Link to iconv for jnlib dependency.
+
 2006-11-20  Werner Koch  <wk@g10code.com>
 
        * call-pinentry.c (agent_popup_message_stop): Use SIGKILL.
index d8c5617..6ec0068 100644 (file)
@@ -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
index ed5b399..4bc6b63 100644 (file)
@@ -1,3 +1,7 @@
+2006-12-07  David Shaw  <dshaw@jabberwocky.com>
+
+       * Makefile.am: Link to iconv for jnlib dependency.
+
 2006-12-05  Werner Koch  <wk@g10code.com>
 
        * passphrase.c (passphrase_to_dek): Handle a Cancel request
index a38e03b..c3e5432 100644 (file)
@@ -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
 
index 1e69571..ef51ad7 100644 (file)
@@ -1,3 +1,7 @@
+2006-12-07  David Shaw  <dshaw@jabberwocky.com>
+
+       * Makefile.am: Link to iconv for jnlib dependency.
+
 2006-11-23  Werner Koch  <wk@g10code.com>
 
        * Makefile.am (gpg_connect_agent_LDADD): Add NETLIBS.
index 5e72f64..be492c0 100644 (file)
@@ -54,13 +54,14 @@ noinst_PROGRAMS = clean-sat mk-tdata make-dns-cert gpgsplit
 common_libs = ../jnlib/libjnlib.a ../common/libcommon.a ../gl/libgnu.a
 pwquery_libs = ../common/libsimple-pwquery.a
 
-gpgsplit_LDADD = $(common_libs) $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) $(ZLIBS)
+gpgsplit_LDADD = $(common_libs) $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) \
+                $(ZLIBS) $(LIBICONV)
 
 gpgconf_SOURCES = gpgconf.c gpgconf.h gpgconf-comp.c no-libgcrypt.c
 
 # jnlib/common sucks in gpg-error, will they, nil they (some compilers
 # do not eliminate the supposed-to-be-unused-inline-functions).
-gpgconf_LDADD = $(common_libs) $(LIBINTL) $(GPG_ERROR_LIBS)
+gpgconf_LDADD = $(common_libs) $(LIBINTL) $(GPG_ERROR_LIBS) $(LIBICONV)
 
 gpgparsemail_SOURCES = gpgparsemail.c rfc822parse.c rfc822parse.h
 gpgparsemail_LDADD = 
@@ -74,7 +75,7 @@ watchgnupg_LDADD = $(NETLIBS)
 
 gpg_connect_agent_SOURCES = gpg-connect-agent.c no-libgcrypt.c
 gpg_connect_agent_LDADD = $(common_libs) $(LIBASSUAN_LIBS) \
-                         $(GPG_ERROR_LIBS) $(LIBINTL) $(NETLIBS)
+                         $(GPG_ERROR_LIBS) $(LIBINTL) $(NETLIBS) $(LIBICONV)
 
 gpgkey2ssh_SOURCES = gpgkey2ssh.c
 gpgkey2ssh_CFLAGS = $(LIBGCRYPT_CFLAGS) $(GPG_ERROR_CFLAGS)