[git] GnuPG - branch, master, updated. gnupg-2.1.15-184-g6054e8a

[by Justus Winter]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The GNU Privacy Guard".

The branch, master has been updated
       via  6054e8aaecbd355bb7559697eecaadf2225189b8 (commit)
      from  e11686f973b35869d7b299ce4726003ac22e2e3a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 6054e8aaecbd355bb7559697eecaadf2225189b8
Author: Justus Winter <justus at g10code.com>
Date:   Fri Sep 30 12:34:31 2016 +0200

    build: Fix build against libiconv.
    
    * agent/Makefile.am: Add INCICONV and LIBICONV.
    * common/Makefile.am: Likewise.
    * tools/Makefile.am: Likewise.
    
    Signed-off-by: Justus Winter <justus at g10code.com>

diff --git a/agent/Makefile.am b/agent/Makefile.am
index 1970088..ed0ed44 100644
--- a/agent/Makefile.am
+++ b/agent/Makefile.am
@@ -64,7 +64,8 @@ pwquery_libs = ../common/libsimple-pwquery.a
 endif
 
 
-gpg_agent_CFLAGS = $(AM_CFLAGS) $(LIBASSUAN_CFLAGS) $(NPTH_CFLAGS)
+gpg_agent_CFLAGS = $(AM_CFLAGS) $(LIBASSUAN_CFLAGS) $(NPTH_CFLAGS) \
+		$(INCICONV)
 gpg_agent_LDADD = $(commonpth_libs) \
                 $(LIBGCRYPT_LIBS) $(LIBASSUAN_LIBS) $(NPTH_LIBS) \
 	        $(GPG_ERROR_LIBS) $(LIBINTL) $(NETLIBS) $(LIBICONV) \
@@ -76,7 +77,8 @@ gpg_protect_tool_SOURCES = \
 	protect-tool.c \
 	protect.c cvt-openpgp.c
 
-gpg_protect_tool_CFLAGS = $(AM_CFLAGS) $(LIBASSUAN_CFLAGS)
+gpg_protect_tool_CFLAGS = $(AM_CFLAGS) $(LIBASSUAN_CFLAGS) \
+	$(INCICONV)
 gpg_protect_tool_LDADD = $(common_libs) $(LIBGCRYPT_LIBS) $(LIBASSUAN_LIBS) \
          $(GPG_ERROR_LIBS) $(LIBINTL) $(NETLIBS) $(LIBICONV)
 
diff --git a/common/Makefile.am b/common/Makefile.am
index 9f151f2..960d1dc 100644
--- a/common/Makefile.am
+++ b/common/Makefile.am
@@ -177,7 +177,7 @@ endif
 t_extra_src = t-support.h
 
 t_common_cflags = $(KSBA_CFLAGS) $(LIBGCRYPT_CFLAGS) \
-                  $(LIBASSUAN_CFLAGS) $(GPG_ERROR_CFLAGS)
+                  $(LIBASSUAN_CFLAGS) $(GPG_ERROR_CFLAGS) $(INCICONV)
 t_common_ldadd = libcommon.a \
                  $(LIBGCRYPT_LIBS) $(LIBASSUAN_LIBS) $(GPG_ERROR_LIBS) \
 	         $(LIBINTL) $(LIBICONV)
diff --git a/tools/Makefile.am b/tools/Makefile.am
index b2a274f..42b023f 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -131,9 +131,10 @@ gpg_connect_agent_LDADD = ../common/libgpgrl.a $(common_libs) \
 
 if !DISABLE_REGEX
 gpg_check_pattern_SOURCES = gpg-check-pattern.c
-gpg_check_pattern_CFLAGS = $(LIBGCRYPT_CFLAGS) $(GPG_ERROR_CFLAGS)
+gpg_check_pattern_CFLAGS = $(LIBGCRYPT_CFLAGS) $(GPG_ERROR_CFLAGS) $(INCICONV)
 gpg_check_pattern_LDADD = $(common_libs) $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) \
-                          $(LIBINTL) $(NETLIBS) $(LIBICONV) $(W32SOCKLIBS)
+			  $(LIBINTL) $(NETLIBS) $(LIBICONV) $(W32SOCKLIBS) \
+			  $(LIBICONV)
 endif
 
 gpgtar_SOURCES = \
@@ -155,8 +156,9 @@ gpg_wks_server_SOURCES = \
 	mime-maker.c  mime-maker.h  \
 	send-mail.c   send-mail.h
 
-gpg_wks_server_CFLAGS = $(GPG_ERROR_CFLAGS)
-gpg_wks_server_LDADD = $(libcommon) $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS)
+gpg_wks_server_CFLAGS = $(GPG_ERROR_CFLAGS) $(INCICONV)
+gpg_wks_server_LDADD = $(libcommon) $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) \
+		       $(LIBICONV)
 
 gpg_wks_client_SOURCES = \
 	gpg-wks-client.c \
@@ -169,9 +171,10 @@ gpg_wks_client_SOURCES = \
 	send-mail.c   send-mail.h   \
 	call-dirmngr.c call-dirmngr.h
 
-gpg_wks_client_CFLAGS = $(LIBASSUAN_CFLAGS) $(GPG_ERROR_CFLAGS)
+gpg_wks_client_CFLAGS = $(LIBASSUAN_CFLAGS) $(GPG_ERROR_CFLAGS) $(INCICONV)
 gpg_wks_client_LDADD = $(libcommon) \
-	               $(LIBASSUAN_LIBS) $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS)
+		       $(LIBASSUAN_LIBS) $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) \
+		       $(LIBICONV)
 
 
 # Make sure that all libs are build before we use them.  This is

-----------------------------------------------------------------------

Summary of changes:
 agent/Makefile.am  |  6 ++++--
 common/Makefile.am |  2 +-
 tools/Makefile.am  | 15 +++++++++------
 3 files changed, 14 insertions(+), 9 deletions(-)


hooks/post-receive
-- 
The GNU Privacy Guard
http://git.gnupg.org