[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[libmicrohttpd] 02/03: Workaround for old broken GnuTLS builds
From: |
gnunet |
Subject: |
[libmicrohttpd] 02/03: Workaround for old broken GnuTLS builds |
Date: |
Mon, 13 Dec 2021 19:08:16 +0100 |
This is an automated email from the git hooks/post-receive script.
karlson2k pushed a commit to branch master
in repository libmicrohttpd.
commit 9a6ebcd612b326acb9485b8c9139bd83c67306bc
Author: Evgeny Grin (Karlson2k) <k2k@narod.ru>
AuthorDate: Mon Dec 13 21:06:17 2021 +0300
Workaround for old broken GnuTLS builds
---
configure.ac | 30 ++++++++++++++++++++++++++++++
src/testcurl/https/Makefile.am | 7 ++++++-
2 files changed, 36 insertions(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
index 982e52a7..53657d89 100644
--- a/configure.ac
+++ b/configure.ac
@@ -57,6 +57,7 @@ AS_IF([test `uname -s` = "OS/390"],
# Checks for programs.
AC_PROG_AWK
AC_PROG_GREP
+AC_PROG_FGREP
AC_PROG_INSTALL
AC_PROG_LN_S
AC_PROG_MAKE_SET
@@ -2597,6 +2598,35 @@ AC_SUBST([GNUTLS_CFLAGS])
AC_SUBST([GNUTLS_LDFLAGS])
AC_SUBST([GNUTLS_LIBS])
+AS_VAR_IF([have_gnutls], ["yes"],
+ [
+ AC_CACHE_CHECK([for GnuTLS quirks], [mhd_cv_gnutls_mthread_broken],
+ [
+ mhd_cv_gnutls_mthread_broken="no"
+ AS_IF([test -r /etc/redhat-release],
+ [
+ AS_IF([$FGREP ' release 6.' /etc/redhat-release >/dev/null ||
$FGREP '(Santiago)' /etc/redhat-release >/dev/null],
+ [mhd_cv_gnutls_mthread_broken="found"],
+ )
+ ]
+ )
+ AS_VAR_IF([mhd_cv_gnutls_mthread_broken], ["no"],
+ [
+ AS_IF([command -v rpm >/dev/null],
+ [
+ AS_IF([test r`rpm -E '%{rhel} 2>/dev/null'` = "r6"],
+ [mhd_cv_gnutls_mthread_broken="found"],
+ )
+ ]
+ )
+ ]
+ )
+ ]
+ )
+ ]
+)
+AM_CONDITIONAL([HAVE_GNUTLS_MTHREAD_BROKEN], [[test
"x${mhd_cv_gnutls_mthread_broken}" = "xfound"]])
+
# optional: HTTP Basic Auth support. Enabled by default
AC_MSG_CHECKING([[whether to support HTTP basic authentication]])
AC_ARG_ENABLE([bauth],
diff --git a/src/testcurl/https/Makefile.am b/src/testcurl/https/Makefile.am
index 47256c58..6c2134dc 100644
--- a/src/testcurl/https/Makefile.am
+++ b/src/testcurl/https/Makefile.am
@@ -36,13 +36,18 @@ THREAD_ONLY_TESTS = \
$(HTTPS_PARALLEL_TESTS) \
$(TEST_HTTPS_SNI) \
test_https_session_info \
- test_https_time_out \
test_https_multi_daemon \
test_https_get \
test_empty_response \
test_https_get_iovec \
$(EMPTY_ITEM)
+if !HAVE_GNUTLS_MTHREAD_BROKEN
+THREAD_ONLY_TESTS += \
+ test_https_time_out \
+ $(EMPTY_ITEM)
+endif
+
check_PROGRAMS = \
test_https_get_select
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.