projects
/
emacs.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
8250a20
)
Have Fgnutls_available_p return Qnil when GNUTLS is undefined
author
Martin Rudalics
<rudalics@gmx.at>
Mon, 17 Jul 2017 07:00:55 +0000
(09:00 +0200)
committer
Martin Rudalics
<rudalics@gmx.at>
Mon, 17 Jul 2017 07:00:55 +0000
(09:00 +0200)
* src/gnutls.c (Fgnutls_available_p): Return Qnil when GNUTLS is
undefined to allow --with-gnutls=no builds to proceed.
src/gnutls.c
patch
|
blob
|
history
diff --git
a/src/gnutls.c
b/src/gnutls.c
index bcccd7ffd37cbea4b66d819046dcb203ec876d11..9fbaea2f4057a88ad19c098c19189beafc941f1a 100644
(file)
--- 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