diff options
| author | Marcus Brinkmann <mb@g10code.com> | 2009-10-16 20:35:03 +0200 |
|---|---|---|
| committer | Marcus Brinkmann <mb@g10code.com> | 2009-10-16 20:35:03 +0200 |
| commit | de563fdeb5078fec5b8ffb24a0fe07c0aa016bbb (patch) | |
| tree | a9f9cd0560772255708c4fdf6bce95221d983629 /g13 | |
| parent | Somehow this slipped through. Really commit this time. (diff) | |
| download | gnupg2-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')
| -rw-r--r-- | g13/ChangeLog | 6 | ||||
| -rw-r--r-- | g13/Makefile.am | 4 | ||||
| -rw-r--r-- | g13/g13.c | 3 |
3 files changed, 11 insertions, 2 deletions
diff --git a/g13/ChangeLog b/g13/ChangeLog index 119ef9b7d..1430297b2 100644 --- a/g13/ChangeLog +++ b/g13/ChangeLog @@ -1,5 +1,11 @@ 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. + +2009-10-16 Marcus Brinkmann <marcus@g10code.com> + * Makefile.am (AM_CFLAGS): Add $(KSBA_CFLAGS). (g13_LDADD): Add $(KSBA_LIBS). 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) @@ -204,6 +204,8 @@ static void join_idle_task (void); /* Begin Pth wrapper functions. */ +ASSUAN_SYSTEM_PTH_IMPL; + GCRY_THREAD_OPTION_PTH_IMPL; static int fixed_gcry_pth_init (void) { @@ -441,6 +443,7 @@ main ( int argc, char **argv) /* Prepare libassuan. */ assuan_set_assuan_log_prefix (log_get_prefix (NULL)); assuan_set_gpg_err_source (GPG_ERR_SOURCE_DEFAULT); + assuan_set_system_hooks (ASSUAN_SYSTEM_PTH); /* Setup a default control structure for command line mode. */ |