summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Rudalics <rudalics@gmx.at>2017-07-17 09:00:55 +0200
committerMartin Rudalics <rudalics@gmx.at>2017-07-17 09:00:55 +0200
commitb7072318334ff84dfe525e7863f1119236979395 (patch)
tree157a85ec833575bd8f65926b2a280ce5934591b9
parent8250a20f9dd6c53ee1891c16a24c746110f594f6 (diff)
downloademacs-b7072318334ff84dfe525e7863f1119236979395.tar.gz
Have Fgnutls_available_p return Qnil when GNUTLS is undefined
* src/gnutls.c (Fgnutls_available_p): Return Qnil when GNUTLS is undefined to allow --with-gnutls=no builds to proceed.
-rw-r--r--src/gnutls.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/gnutls.c b/src/gnutls.c
index bcccd7ffd37..9fbaea2f405 100644
--- a/src/gnutls.c
+++ b/src/gnutls.c
@@ -2435,6 +2435,8 @@ GnuTLS AEAD ciphers : the list will contain `AEAD-ciphers'. */)
{
Lisp_Object capabilities = Qnil;
+#ifdef HAVE_GNUTLS
+
# ifdef HAVE_GNUTLS3
capabilities = Fcons (intern("gnutls3"), capabilities);
@@ -2470,7 +2472,11 @@ GnuTLS AEAD ciphers : the list will contain `AEAD-ciphers'. */)
return capabilities;
-#endif
+#endif /* WINDOWSNT */
+
+#else /* !HAVE_GNUTLS */
+ return Qnil;
+#endif /* HAVE_GNUTLS */
}
void