diff options
| author | Werner Koch <wk@gnupg.org> | 2015-10-19 12:43:22 +0200 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2015-10-19 13:17:58 +0200 |
| commit | 8c609eaf35b547f02979ef0b206520dd0853b294 (patch) | |
| tree | 7d04063be01b31b438cf4a2f95d1646ecc809607 /dirmngr/Makefile.am | |
| parent | gpg: Fix formatting. (diff) | |
| download | gnupg2-8c609eaf35b547f02979ef0b206520dd0853b294.tar.xz gnupg2-8c609eaf35b547f02979ef0b206520dd0853b294.zip | |
dirmngr: Use Assuan socket wrappers for http.c
* dirmngr/http.c: Include assuan.h. Changed all code taking a socket
descriptor from int to assuan_fd_t.
(my_unprotect, my_protect): New.
(my_connect): Remove.
(_my_socket_new, _my_socket_unref): use assuan_sock_close.
(connect_server): Use assuan_sock_connect, assuan_sock_new, and
assuan_sock_close.
* dirmngr/Makefile.am (t_common_ldadd): Add LIBASSUAN_LIBS.
--
This change prepares for the use of SOCKS5 with http.
Signed-off-by: Werner Koch <wk@gnupg.org>
Diffstat (limited to 'dirmngr/Makefile.am')
| -rw-r--r-- | dirmngr/Makefile.am | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/dirmngr/Makefile.am b/dirmngr/Makefile.am index a9f09fde5..ae16660e7 100644 --- a/dirmngr/Makefile.am +++ b/dirmngr/Makefile.am @@ -109,7 +109,7 @@ no-libgcrypt.c : $(top_srcdir)/tools/no-libgcrypt.c t_common_src = t-support.h -t_common_ldadd = $(libcommon) no-libgcrypt.o \ +t_common_ldadd = $(libcommon) no-libgcrypt.o $(LIBASSUAN_LIBS) \ $(GPG_ERROR_LIBS) $(NETLIBS) \ $(NTBTLS_LIBS) $(LIBGNUTLS_LIBS) \ $(DNSLIBS) $(LIBINTL) $(LIBICONV) |