[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [libmicrohttpd] 02/03: configure: check for GnuTLS SNI supp
From: |
gnunet |
Subject: |
[GNUnet-SVN] [libmicrohttpd] 02/03: configure: check for GnuTLS SNI support on all detection paths and unify detection |
Date: |
Mon, 06 Nov 2017 19:16:59 +0100 |
This is an automated email from the git hooks/post-receive script.
karlson2k pushed a commit to branch master
in repository libmicrohttpd.
commit 9046f74fa7f0d07cc56f28f4f7125f578b1bc884
Author: Evgeny Grin (Karlson2k) <address@hidden>
AuthorDate: Mon Nov 6 18:39:57 2017 +0300
configure: check for GnuTLS SNI support on all detection paths
and unify detection
---
configure.ac | 22 ++++++++++------------
1 file changed, 10 insertions(+), 12 deletions(-)
diff --git a/configure.ac b/configure.ac
index abf436c9..3e5e26fd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1388,7 +1388,6 @@ AC_ARG_WITH([[gnutls]],
GNUTLS_CPPFLAGS="-I$with_gnutls/include"
GNUTLS_LDFLAGS="-L$with_gnutls/lib"
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])
AS_IF([test "x$have_gnutls" != "xyes"], [AC_MSG_ERROR([can't find
usable libgnutls at specified prefix $with_gnutls])])
@@ -1428,16 +1427,6 @@ AS_IF([test "x$with_gnutls" != "xno" && test
"x$have_gnutls" != "xyes"],
have_gnutls=yes
GNUTLS_CPPFLAGS="$GNUTLS_CFLAGS"
GNUTLS_LDFLAGS="$GNUTLS_LIBS"
- AC_MSG_CHECKING([[for gnutls_privkey_import_x509_raw()]])
- AC_LINK_IFELSE([
- AC_LANG_PROGRAM([[#include <gnutls/gnutls.h>]], [[
- gnutls_datum_t data;
- gnutls_privkey_t key;
- gnutls_load_file("key.pem", &data);
- gnutls_privkey_import_x509_raw(key, &data,
GNUTLS_X509_FMT_PEM, NULL, 0);
- gnutls_free(data.data);
- ]])], [[have_gnutls_sni=yes]], [[have_gnutls_sni=no]])
- AC_MSG_RESULT([[$have_gnutls_sni]])
],
[
AC_MSG_RESULT([[no]])
@@ -1459,7 +1448,6 @@ AS_IF([test "x$with_gnutls" != "xno" && test
"x$have_gnutls" != "xyes"],
[AC_CHECK_LIB([gnutls], [gnutls_priority_set],
[
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])
])
@@ -1516,6 +1504,16 @@ AS_IF([test "x$have_gnutls" != "xyes" && test
"x$with_gnutls" = "xyes"], [AC_MSG
CFLAGS="$GNUTLS_CFLAGS $CFLAGS"
LDFLAGS="$GNUTLS_LIBS $LDFLAGS"
LIBS="$LIBS $GNUTLS_LIBS"
+ AC_MSG_CHECKING([[for gnutls_privkey_import_x509_raw()]])
+ AC_LINK_IFELSE([
+ AC_LANG_PROGRAM([[#include <gnutls/gnutls.h>]], [[
+ gnutls_datum_t data;
+ gnutls_privkey_t key;
+ gnutls_load_file("key.pem", &data);
+ gnutls_privkey_import_x509_raw(key, &data, GNUTLS_X509_FMT_PEM,
NULL, 0);
+ gnutls_free(data.data);
+ ]])], [[have_gnutls_sni=yes]], [[have_gnutls_sni=no]])
+ AC_MSG_RESULT([[$have_gnutls_sni]])
AC_CACHE_CHECK([[whether GnuTLS require libgcrypt initialisaion]],
[mhd_cv_grypt_required],
[
AC_COMPILE_IFELSE(
--
To stop receiving notification emails like this one, please contact
address@hidden