diff options
| author | Werner Koch <wk@gnupg.org> | 2014-10-02 17:33:57 +0200 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2014-10-02 17:33:57 +0200 |
| commit | f2361e6d582d4343d71d294ed1da654afe7750ee (patch) | |
| tree | 4864aac70c3ef5f5b121e210d671b5b67d7ba422 /common/Makefile.am | |
| parent | build: Update m4 scripts (diff) | |
| download | gnupg2-f2361e6d582d4343d71d294ed1da654afe7750ee.tar.xz gnupg2-f2361e6d582d4343d71d294ed1da654afe7750ee.zip | |
First changes for future use of NTBTLS.
* configure.ac (NEED_NTBTLS_ABI, NEED_NTBTLS_VERSION): New.
(HTTP_USE_NTBTLS): New. Prefer over GNUTLS.
* m4/ntbtls.m4: New.
* m4/Makefile.am (EXTRA_DIST): Add new file.
* common/http.c: Add conditionals to eventually use NTBTLS.
--
This is only the configure stuff. If you have NTBTLS installed GNUTLS
will not be used but there won't be any https support either :-(.
This patch is used to have a real world test bench for the forthcoming
library.
Diffstat (limited to 'common/Makefile.am')
| -rw-r--r-- | common/Makefile.am | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/common/Makefile.am b/common/Makefile.am index 03bc5eb06..87d68208e 100644 --- a/common/Makefile.am +++ b/common/Makefile.am @@ -226,8 +226,9 @@ t_zb32_LDADD = $(t_common_ldadd) # http tests t_http_SOURCES = t-http.c -t_http_CFLAGS = $(t_common_cflags) $(LIBGNUTLS_CFLAGS) -t_http_LDADD = libcommontls.a $(t_common_ldadd) $(LIBGNUTLS_LIBS) $(DNSLIBS) +t_http_CFLAGS = $(t_common_cflags) $(NTBTLS_CFLAGS) $(LIBGNUTLS_CFLAGS) +t_http_LDADD = libcommontls.a $(t_common_ldadd) \ + $(NTBTLS_LIBS) $(LIBGNUTLS_LIBS) $(DNSLIBS) # All programs should depend on the created libs. $(PROGRAMS) : libcommon.a libcommonpth.a libcommontls.a libcommontlsnpth.a |