summaryrefslogtreecommitdiffstats
path: root/m4/Makefile.am
diff options
context:
space:
mode:
authorWerner Koch <wk@gnupg.org>2014-10-02 17:33:57 +0200
committerWerner Koch <wk@gnupg.org>2014-10-02 17:33:57 +0200
commitf2361e6d582d4343d71d294ed1da654afe7750ee (patch)
tree4864aac70c3ef5f5b121e210d671b5b67d7ba422 /m4/Makefile.am
parentbuild: Update m4 scripts (diff)
downloadgnupg2-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 'm4/Makefile.am')
-rw-r--r--m4/Makefile.am2
1 files changed, 1 insertions, 1 deletions
diff --git a/m4/Makefile.am b/m4/Makefile.am
index 05a2be366..f1b8df9bd 100644
--- a/m4/Makefile.am
+++ b/m4/Makefile.am
@@ -4,7 +4,7 @@ EXTRA_DIST += ldap.m4 libcurl.m4 libusb.m4 tar-ustar.m4 readline.m4
EXTRA_DIST += gnupg-pth.m4
-EXTRA_DIST += gpg-error.m4 libgcrypt.m4 libassuan.m4 ksba.m4
+EXTRA_DIST += gpg-error.m4 libgcrypt.m4 libassuan.m4 ksba.m4 ntbtls.m4
EXTRA_DIST += autobuild.m4