aboutsummaryrefslogtreecommitdiffstats
path: root/agent
diff options
context:
space:
mode:
authorJustus Winter <[email protected]>2016-09-30 10:34:31 +0000
committerJustus Winter <[email protected]>2016-09-30 15:45:59 +0000
commit6054e8aaecbd355bb7559697eecaadf2225189b8 (patch)
tree8dad3ead3f3f3b0043f1defc952b428414624016 /agent
parentagent: Enable restricted, browser, and ssh socket by default. (diff)
downloadgnupg-6054e8aaecbd355bb7559697eecaadf2225189b8.tar.gz
gnupg-6054e8aaecbd355bb7559697eecaadf2225189b8.zip
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 <[email protected]>
Diffstat (limited to 'agent')
-rw-r--r--agent/Makefile.am6
1 files changed, 4 insertions, 2 deletions
diff --git a/agent/Makefile.am b/agent/Makefile.am
index 19700888b..ed0ed441f 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)