Переглянути джерело

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.
Evgeny Grin (Karlson2k) 5 роки тому
батько
коміт
d3589c58ff
1 змінених файлів з 4 додано та 4 видалено
  1. 4 4
      configure.ac

+ 4 - 4
configure.ac

@@ -1770,7 +1770,7 @@ AC_ARG_WITH([[gnutls]],
         CPPFLAGS="-I$with_gnutls/include $CPPFLAGS"
         have_gnutls_pkgcfg=no
           AC_CHECK_HEADERS([gnutls/gnutls.h],
-            [AC_CHECK_LIB([gnutls], [gnutls_record_uncork],
+            [AC_CHECK_LIB([gnutls], [gnutls_priority_set],
               [
                 GNUTLS_CPPFLAGS="-I$with_gnutls/include"
                 GNUTLS_LDFLAGS="-L$with_gnutls/lib"
@@ -1882,7 +1882,7 @@ choke me now
        # check for GnuTLS at default paths
        have_gnutls_pkgcfg='no'
        AC_CHECK_HEADERS([gnutls/gnutls.h],
-        [AC_CHECK_LIB([gnutls], [gnutls_record_uncork],
+        [AC_CHECK_LIB([gnutls], [gnutls_priority_set],
           [
             GNUTLS_LIBS="-lgnutls"
             have_gnutls=yes
@@ -1909,8 +1909,8 @@ AS_IF([test "x$with_gnutls" != "xno" && test "x$have_gnutls" != "xyes"],
        # A bit of hack: unset cache variable to force recheck
        AS_UNSET([ac_cv_header_gnutls_gnutls_h])
        AC_CHECK_HEADERS([gnutls/gnutls.h],
-        [AS_UNSET([ac_cv_lib_gnutls_gnutls_record_uncork]) # A bit of hack: unset cache variable to force recheck
-         AC_CHECK_LIB([gnutls], [gnutls_record_uncork],
+        [AS_UNSET([ac_cv_lib_gnutls_gnutls_priority_set]) # A bit of hack: unset cache variable to force recheck
+         AC_CHECK_LIB([gnutls], [gnutls_priority_set],
           [
             GNUTLS_CPPFLAGS="$LIBGCRYPT_CFLAGS"
             GNUTLS_CFLAGS="$LIBGCRYPT_CFLAGS"