aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvgeny Grin (Karlson2k) <k2k@narod.ru>2020-12-25 17:37:56 +0300
committerEvgeny Grin (Karlson2k) <k2k@narod.ru>2020-12-25 17:37:56 +0300
commitd3589c58ffcee474e7ae2f2ce613938cec37f312 (patch)
tree3693738ab46872a08b5088cb63dac982cd1461d2
parentfb283746eb7c7ce6fade0ee340883700ca71ef1b (diff)
downloadlibmicrohttpd-d3589c58ffcee474e7ae2f2ce613938cec37f312.tar.gz
libmicrohttpd-d3589c58ffcee474e7ae2f2ce613938cec37f312.zip
Revert "fix #6594: better test for gnutls_record_uncork"
This reverts commit ed6afa825ea8e1c88fe931a10e1adfd32851fe39. MHD is not using gnutls_record_(un)cork anymore, allow to compile it with older GnuTLS. NOTE: it's generally bad idea to use outdated versions of TLS lib as it may contain some vulnerabilities.
-rw-r--r--configure.ac8
1 files changed, 4 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac
index bd067afb..61b903d7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1770,7 +1770,7 @@ AC_ARG_WITH([[gnutls]],
1770 CPPFLAGS="-I$with_gnutls/include $CPPFLAGS" 1770 CPPFLAGS="-I$with_gnutls/include $CPPFLAGS"
1771 have_gnutls_pkgcfg=no 1771 have_gnutls_pkgcfg=no
1772 AC_CHECK_HEADERS([gnutls/gnutls.h], 1772 AC_CHECK_HEADERS([gnutls/gnutls.h],
1773 [AC_CHECK_LIB([gnutls], [gnutls_record_uncork], 1773 [AC_CHECK_LIB([gnutls], [gnutls_priority_set],
1774 [ 1774 [
1775 GNUTLS_CPPFLAGS="-I$with_gnutls/include" 1775 GNUTLS_CPPFLAGS="-I$with_gnutls/include"
1776 GNUTLS_LDFLAGS="-L$with_gnutls/lib" 1776 GNUTLS_LDFLAGS="-L$with_gnutls/lib"
@@ -1882,7 +1882,7 @@ choke me now
1882 # check for GnuTLS at default paths 1882 # check for GnuTLS at default paths
1883 have_gnutls_pkgcfg='no' 1883 have_gnutls_pkgcfg='no'
1884 AC_CHECK_HEADERS([gnutls/gnutls.h], 1884 AC_CHECK_HEADERS([gnutls/gnutls.h],
1885 [AC_CHECK_LIB([gnutls], [gnutls_record_uncork], 1885 [AC_CHECK_LIB([gnutls], [gnutls_priority_set],
1886 [ 1886 [
1887 GNUTLS_LIBS="-lgnutls" 1887 GNUTLS_LIBS="-lgnutls"
1888 have_gnutls=yes 1888 have_gnutls=yes
@@ -1909,8 +1909,8 @@ AS_IF([test "x$with_gnutls" != "xno" && test "x$have_gnutls" != "xyes"],
1909 # A bit of hack: unset cache variable to force recheck 1909 # A bit of hack: unset cache variable to force recheck
1910 AS_UNSET([ac_cv_header_gnutls_gnutls_h]) 1910 AS_UNSET([ac_cv_header_gnutls_gnutls_h])
1911 AC_CHECK_HEADERS([gnutls/gnutls.h], 1911 AC_CHECK_HEADERS([gnutls/gnutls.h],
1912 [AS_UNSET([ac_cv_lib_gnutls_gnutls_record_uncork]) # A bit of hack: unset cache variable to force recheck 1912 [AS_UNSET([ac_cv_lib_gnutls_gnutls_priority_set]) # A bit of hack: unset cache variable to force recheck
1913 AC_CHECK_LIB([gnutls], [gnutls_record_uncork], 1913 AC_CHECK_LIB([gnutls], [gnutls_priority_set],
1914 [ 1914 [
1915 GNUTLS_CPPFLAGS="$LIBGCRYPT_CFLAGS" 1915 GNUTLS_CPPFLAGS="$LIBGCRYPT_CFLAGS"
1916 GNUTLS_CFLAGS="$LIBGCRYPT_CFLAGS" 1916 GNUTLS_CFLAGS="$LIBGCRYPT_CFLAGS"