diff options
| author | Werner Koch <wk@gnupg.org> | 2019-11-26 12:02:27 +0100 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2019-11-26 12:02:27 +0100 |
| commit | 1009e4e5f71347a1fe194e59a9d88c8034a67016 (patch) | |
| tree | 8e72265e50d46714ef3330387f5797b1e49dd450 /configure.ac | |
| parent | doc: Fixed variable naming. (diff) | |
| download | gnupg2-1009e4e5f71347a1fe194e59a9d88c8034a67016.tar.xz gnupg2-1009e4e5f71347a1fe194e59a9d88c8034a67016.zip | |
dirmngr: Make building with a TLS library mandatory
* configure.ac: Do not build dirmngr if no TLS is available.
* dirmngr/http.c: Remove all uses of the USE_TLS macro.
Signed-off-by: Werner Koch <wk@gnupg.org>
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 3ccd8ab6a..b7027ebdc 100644 --- a/configure.ac +++ b/configure.ac @@ -1026,7 +1026,7 @@ AC_ARG_ENABLE(npth-debug, # -# NTBTLS is our TLS library. If it is not available fallback to +# NTBTLS is our TLS library. If it is not available we fall back to # GNUTLS. # AC_ARG_ENABLE(ntbtls, @@ -1057,9 +1057,10 @@ else AC_DEFINE(HTTP_USE_GNUTLS, 1, [Enable GNUTLS support in http.c]) else tmp=$(echo "$LIBGNUTLS_PKG_ERRORS" | tr '\n' '\v' | sed 's/\v/\n*** /g') + build_dirmngr=no AC_MSG_WARN([[ *** -*** Building without NTBTLS and GNUTLS - no TLS access to keyservers. +*** Neither NTBTLS nor GNUTLS available - not building dirmngr. *** *** $tmp]]) fi |