[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[libmicrohttpd] 01/02: Additional fix for old gnutls versions
From: |
gnunet |
Subject: |
[libmicrohttpd] 01/02: Additional fix for old gnutls versions |
Date: |
Thu, 16 Dec 2021 15:11:53 +0100 |
This is an automated email from the git hooks/post-receive script.
karlson2k pushed a commit to branch master
in repository libmicrohttpd.
commit feb04e725cc6a87f0beb3abebb44789830a86a6b
Author: Evgeny Grin (Karlson2k) <k2k@narod.ru>
AuthorDate: Thu Dec 16 11:29:45 2021 +0300
Additional fix for old gnutls versions
---
configure.ac | 9 +++++++++
src/microhttpd/Makefile.am | 5 ++---
2 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/configure.ac b/configure.ac
index 68f8f0d3..e9a15565 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2645,9 +2645,18 @@ AS_VAR_IF([have_gnutls], ["yes"],
)
]
)
+ AC_CACHE_CHECK([for gnutls-cli binary], [mhd_cv_gnutls_cli],
+ [
+ mhd_cv_gnutls_cli="no"
+ AS_IF([command -v gnutls-cli >/dev/null 2>&1],
+ [AS_IF([AC_RUN_LOG([gnutls-cli --version >&2])],
[mhd_cv_gnutls_cli="yes"])]
+ )
+ ]
+ )
]
)
AM_CONDITIONAL([HAVE_GNUTLS_MTHREAD_BROKEN], [[test
"x${mhd_cv_gnutls_mthread_broken}" = "xfound"]])
+AM_CONDITIONAL([USE_UPGRADE_TLS_TESTS], [[test
"x${mhd_cv_gnutls_mthread_broken}" = "xno" || test "x${mhd_cv_gnutls_cli}" ==
"xyes"]])
# optional: HTTP Basic Auth support. Enabled by default
AC_MSG_CHECKING([[whether to support HTTP basic authentication]])
diff --git a/src/microhttpd/Makefile.am b/src/microhttpd/Makefile.am
index 563a8c28..79abda1d 100644
--- a/src/microhttpd/Makefile.am
+++ b/src/microhttpd/Makefile.am
@@ -214,11 +214,10 @@ if USE_W32_THREADS
check_PROGRAMS += test_upgrade test_upgrade_large
endif
if ENABLE_HTTPS
-if USE_POSIX_THREADS
+if USE_THREADS
+if USE_UPGRADE_TLS_TESTS
check_PROGRAMS += test_upgrade_tls test_upgrade_large_tls
endif
-if USE_W32_THREADS
-check_PROGRAMS += test_upgrade_tls test_upgrade_large_tls
endif
endif
endif
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.