diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2017-08-02 19:46:41 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2017-08-02 19:49:43 -0700 |
| commit | a8a81df8da1adad2d4feb22b1fd6aac0f7ca98d2 (patch) | |
| tree | 765664da2f91c54802c663e1cb8c9ba81c4ebb5c /src/gnutls.h | |
| parent | 2d2c12fc5f45ff73387efd6241447f3d9cbadf09 (diff) | |
| download | emacs-a8a81df8da1adad2d4feb22b1fd6aac0f7ca98d2.tar.gz | |
Simplify configuration of HAVE_GNUTLS3 etc.
There's only one GnuTLS, so configuring these symbols at
'configure' time is overkill. Simplify things by moving their
configuration to src/gnutls.h (Bug#27708).
* configure.ac (HAVE_GNUTLS3, HAVE_GNUTLS3_HMAC, HAVE_GNUTLS3_AEAD)
(HAVE_GNUTLS3_CIPHER, HAVE_GNUTLS3_DIGEST): Move these definitions
from here ...
* src/gnutls.h: ... to here, and simplify.
Diffstat (limited to 'src/gnutls.h')
| -rw-r--r-- | src/gnutls.h | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/src/gnutls.h b/src/gnutls.h index 3ec86a8892d..19c16867d7a 100644 --- a/src/gnutls.h +++ b/src/gnutls.h @@ -23,8 +23,16 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ #include <gnutls/gnutls.h> #include <gnutls/x509.h> -#ifdef HAVE_GNUTLS3 -#include <gnutls/crypto.h> +#if 0x030000 <= GNUTLS_VERSION_NUMBER +# define HAVE_GNUTLS3 +# include <gnutls/crypto.h> +#endif + +#if 0x030400 <= GNUTLS_VERSION_NUMBER +# define HAVE_GNUTLS3_AEAD +# define HAVE_GNUTLS3_CIPHER +# define HAVE_GNUTLS3_DIGEST +# define HAVE_GNUTLS3_HMAC #endif #include "lisp.h" |