From: Martin Rudalics <rudalics@gmx.at>
Date: Mon, 17 Jul 2017 07:00:55 +0000 (+0200)
Subject: Have Fgnutls_available_p return Qnil when GNUTLS is undefined
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~21^2~1543^2~81
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=b7072318334ff84dfe525e7863f1119236979395;p=emacs.git

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.
---

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