aboutsummaryrefslogtreecommitdiffstats
path: root/agent/Makefile.am
diff options
context:
space:
mode:
authorMarcus Brinkmann <[email protected]>2009-10-16 18:35:03 +0000
committerMarcus Brinkmann <[email protected]>2009-10-16 18:35:03 +0000
commitde563fdeb5078fec5b8ffb24a0fe07c0aa016bbb (patch)
treea9f9cd0560772255708c4fdf6bce95221d983629 /agent/Makefile.am
parentSomehow this slipped through. Really commit this time. (diff)
downloadgnupg-de563fdeb5078fec5b8ffb24a0fe07c0aa016bbb.tar.gz
gnupg-de563fdeb5078fec5b8ffb24a0fe07c0aa016bbb.zip
2009-10-16 Marcus Brinkmann <[email protected]>
* configure.ac: Check for libassuan instead of libassuan-pth. common/ 2009-10-16 Marcus Brinkmann <[email protected]> * Makefile.am (libcommon_a_CFLAGS): Use LIBASSUAN_CFLAGS instead of LIBASSUAN_PTH_CFLAGS. scd/ 2009-10-16 Marcus Brinkmann <[email protected]> * 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 <[email protected]> * 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 <[email protected]> * 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 'agent/Makefile.am')
-rw-r--r--agent/Makefile.am4
1 files changed, 2 insertions, 2 deletions
diff --git a/agent/Makefile.am b/agent/Makefile.am
index c2830a94b..38200c1d8 100644
--- a/agent/Makefile.am
+++ b/agent/Makefile.am
@@ -62,9 +62,9 @@ gpg_agent_res_deps =
#endif
-gpg_agent_CFLAGS = $(AM_CFLAGS) $(LIBASSUAN_PTH_CFLAGS) $(PTH_CFLAGS)
+gpg_agent_CFLAGS = $(AM_CFLAGS) $(LIBASSUAN_CFLAGS) $(PTH_CFLAGS)
gpg_agent_LDADD = $(commonpth_libs) \
- $(LIBGCRYPT_LIBS) $(LIBASSUAN_PTH_LIBS) $(PTH_LIBS) \
+ $(LIBGCRYPT_LIBS) $(LIBASSUAN_LIBS) $(PTH_LIBS) \
$(GPG_ERROR_LIBS) $(LIBINTL) $(NETLIBS) $(LIBICONV)
gpg_agent_LDFLAGS = $(gpg_agent_res_ldflags)
gpg_agent_DEPENDENCIES = $(gpg_agent_res_deps)