summaryrefslogtreecommitdiffstats
path: root/g13/Makefile.am
diff options
context:
space:
mode:
authorMarcus Brinkmann <mb@g10code.com>2009-10-16 20:35:03 +0200
committerMarcus Brinkmann <mb@g10code.com>2009-10-16 20:35:03 +0200
commitde563fdeb5078fec5b8ffb24a0fe07c0aa016bbb (patch)
treea9f9cd0560772255708c4fdf6bce95221d983629 /g13/Makefile.am
parentSomehow this slipped through. Really commit this time. (diff)
downloadgnupg2-de563fdeb5078fec5b8ffb24a0fe07c0aa016bbb.tar.xz
gnupg2-de563fdeb5078fec5b8ffb24a0fe07c0aa016bbb.zip
2009-10-16 Marcus Brinkmann <marcus@g10code.com>
* configure.ac: Check for libassuan instead of libassuan-pth. common/ 2009-10-16 Marcus Brinkmann <marcus@g10code.com> * Makefile.am (libcommon_a_CFLAGS): Use LIBASSUAN_CFLAGS instead of LIBASSUAN_PTH_CFLAGS. scd/ 2009-10-16 Marcus Brinkmann <marcus@g10code.com> * AM_CFLAGS, scdaemon_LDADD: Use libassuan instead of libassuan-pth. * scdaemon.c: Invoke ASSUAN_SYSTEM_PTH_IMPL. (main): Call assuan_set_system_hooks and assuan_sock_init. g13/ 2009-10-16 Marcus Brinkmann <marcus@g10code.com> * AM_CFLAGS, g13_LDADD: Use libassuan instead of libassuan-pth. * g13.c: Invoke ASSUAN_SYSTEM_PTH_IMPL. (main): Call assuan_set_system_hooks. agent/ 2009-10-16 Marcus Brinkmann <marcus@g10code.com> * gpg_agent_CFLAGS, gpg_agent_LDADD: Use libassuan instead of libassuan-pth. * gpg-agent.c: Invoke ASSUAN_SYSTEM_PTH_IMPL. (main): Call assuan_set_system_hooks and assuan_sock_init. Fix invocation of assuan_socket_connect.
Diffstat (limited to 'g13/Makefile.am')
-rw-r--r--g13/Makefile.am4
1 files changed, 2 insertions, 2 deletions
diff --git a/g13/Makefile.am b/g13/Makefile.am
index f10f7fd38..cf25f6945 100644
--- a/g13/Makefile.am
+++ b/g13/Makefile.am
@@ -25,7 +25,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/gl -I$(top_srcdir)/intl -I$(top_srcdir)/common
include $(top_srcdir)/am/cmacros.am
AM_CFLAGS = $(LIBGCRYPT_CFLAGS) $(KSBA_CFLAGS) \
- $(LIBASSUAN_PTH_CFLAGS) $(PTH_CFLAGS)
+ $(LIBASSUAN_CFLAGS) $(PTH_CFLAGS)
g13_SOURCES = \
g13.c g13.h \
@@ -42,6 +42,6 @@ g13_SOURCES = \
be-truecrypt.c be-truecrypt.h
g13_LDADD = $(libcommonpth) ../jnlib/libjnlib.a ../gl/libgnu.a \
- $(LIBGCRYPT_LIBS) $(KSBA_LIBS) $(LIBASSUAN_PTH_LIBS) $(PTH_LIBS) \
+ $(LIBGCRYPT_LIBS) $(KSBA_LIBS) $(LIBASSUAN_LIBS) $(PTH_LIBS) \
$(GPG_ERROR_LIBS) $(LIBINTL)