[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [libmicrohttpd] 01/02: configure: properly and deeply check
From: |
gnunet |
Subject: |
[GNUnet-SVN] [libmicrohttpd] 01/02: configure: properly and deeply check for GnuTLS SNI, avoid double testing |
Date: |
Fri, 24 Nov 2017 11:13:48 +0100 |
This is an automated email from the git hooks/post-receive script.
karlson2k pushed a commit to branch master
in repository libmicrohttpd.
commit 0e477b3363043c0b5b2791b20c771985b7f9ff23
Author: Evgeny Grin (Karlson2k) <address@hidden>
AuthorDate: Fri Nov 24 12:55:24 2017 +0300
configure: properly and deeply check for GnuTLS SNI, avoid double testing
---
configure.ac | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
diff --git a/configure.ac b/configure.ac
index fee368be..564f36ff 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1617,7 +1617,6 @@ AS_IF([test "x$with_gnutls" != "xno" && test
"x$have_gnutls" != "xyes"],
GNUTLS_CFLAGS="$LIBGCRYPT_CFLAGS"
GNUTLS_LDFLAGS="$LIBGCRYPT_LIBS"
GNUTLS_LIBS="-lgnutls"
- AC_CHECK_LIB([gnutls], [gnutls_load_file], [AC_CHECK_LIB([gnutls],
[gnutls_privkey_import_x509_raw], [have_gnutls_sni=yes])])
have_gnutls=yes
])], [], [AC_INCLUDES_DEFAULT])
CPPFLAGS="$SAVE_CPPFLAGS"
@@ -1645,9 +1644,18 @@ AS_IF([test "x$have_gnutls" != "xyes" && test
"x$with_gnutls" = "xyes"], [AC_MSG
LIBS="$LIBS $GNUTLS_LIBS"
AC_MSG_CHECKING([[for gnutls_privkey_import_x509_raw()]])
AC_LINK_IFELSE([
- AC_LANG_PROGRAM([[#include <gnutls/gnutls.h>]], [[
+ AC_LANG_PROGRAM([[
+#include <gnutls/gnutls.h>
+#include <gnutls/abstract.h>
+ ]], [[
gnutls_datum_t data;
- gnutls_privkey_t key;
+ gnutls_privkey_t key = 0;
+#ifndef gnutls_load_file
+ (void)gnutls_load_file; /* Check for declaration. */
+#endif
+#ifndef gnutls_privkey_import_x509_raw
+ (void)gnutls_privkey_import_x509_raw; /* Check for declaration. */
+#endif
gnutls_load_file("key.pem", &data);
gnutls_privkey_import_x509_raw(key, &data, GNUTLS_X509_FMT_PEM,
NULL, 0);
gnutls_free(data.data);
--
To stop receiving notification emails like this one, please contact
address@hidden