[svn] GnuPG - r4374 - in trunk: agent g10 tools

[svn author dshaw]

Author: dshaw
Date: 2006-12-08 00:20:20 +0100 (Fri, 08 Dec 2006)
New Revision: 4374

Modified:
   trunk/agent/ChangeLog
   trunk/agent/Makefile.am
   trunk/g10/ChangeLog
   trunk/g10/Makefile.am
   trunk/tools/ChangeLog
   trunk/tools/Makefile.am
Log:
Makefile.am: Link to iconv for jnlib dependency. (OSX)


Modified: trunk/agent/ChangeLog
===================================================================
--- trunk/agent/ChangeLog	2006-12-07 18:16:45 UTC (rev 4373)
+++ trunk/agent/ChangeLog	2006-12-07 23:20:20 UTC (rev 4374)
@@ -1,3 +1,7 @@
+2006-12-07  David Shaw  <dshaw at jabberwocky.com>
+
+	* Makefile.am: Link to iconv for jnlib dependency.
+
 2006-11-20  Werner Koch  <wk at g10code.com>
 
 	* call-pinentry.c (agent_popup_message_stop): Use SIGKILL.

Modified: trunk/agent/Makefile.am
===================================================================
--- trunk/agent/Makefile.am	2006-12-07 18:16:45 UTC (rev 4373)
+++ trunk/agent/Makefile.am	2006-12-07 23:20:20 UTC (rev 4374)
@@ -53,7 +53,7 @@
 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 @@
 
 # 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

Modified: trunk/g10/ChangeLog
===================================================================
--- trunk/g10/ChangeLog	2006-12-07 18:16:45 UTC (rev 4373)
+++ trunk/g10/ChangeLog	2006-12-07 23:20:20 UTC (rev 4374)
@@ -1,3 +1,7 @@
+2006-12-07  David Shaw  <dshaw at jabberwocky.com>
+
+	* Makefile.am: Link to iconv for jnlib dependency.
+
 2006-12-05  Werner Koch  <wk at g10code.com>
 
 	* passphrase.c (passphrase_to_dek): Handle a Cancel request

Modified: trunk/g10/Makefile.am
===================================================================
--- trunk/g10/Makefile.am	2006-12-07 18:16:45 UTC (rev 4373)
+++ trunk/g10/Makefile.am	2006-12-07 23:20:20 UTC (rev 4374)
@@ -118,8 +118,10 @@
 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
 

Modified: trunk/tools/ChangeLog
===================================================================
--- trunk/tools/ChangeLog	2006-12-07 18:16:45 UTC (rev 4373)
+++ trunk/tools/ChangeLog	2006-12-07 23:20:20 UTC (rev 4374)
@@ -1,3 +1,7 @@
+2006-12-07  David Shaw  <dshaw at jabberwocky.com>
+
+	* Makefile.am: Link to iconv for jnlib dependency.
+
 2006-11-23  Werner Koch  <wk at g10code.com>
 
 	* Makefile.am (gpg_connect_agent_LDADD): Add NETLIBS.

Modified: trunk/tools/Makefile.am
===================================================================
--- trunk/tools/Makefile.am	2006-12-07 18:16:45 UTC (rev 4373)
+++ trunk/tools/Makefile.am	2006-12-07 23:20:20 UTC (rev 4374)
@@ -54,13 +54,14 @@
 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 @@
 
 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)