diff --git a/NEWS b/NEWS index b4aa450d..5d003ec7 100644 --- a/NEWS +++ b/NEWS @@ -18,6 +18,8 @@ To be released as 0.11.5. * bug 698: Attach controls to the intended form even if it is incorrectly nested in a table. (Was broken in 0.11.4.) * build bug 1021: fixed uninitialized variable in http_got_header +* build: don't use libgnutls-openssl, which is no longer GPLv2 + compatible in GnuTLS 2.2.0 ELinks 0.11.4: -------------- diff --git a/configure.in b/configure.in index c7e7081e..47d505b5 100644 --- a/configure.in +++ b/configure.in @@ -955,12 +955,10 @@ else CFLAGS="$CFLAGS_X" AC_SUBST(GNUTLS_CFLAGS) - # Verify if the MD5 compatibility layer is usable. - CONFIG_GNUTLS_OPENSSL_COMPAT=yes - EL_CHECK_OPTIONAL_LIBRARY(CONFIG_GNUTLS_OPENSSL_COMPAT, - [GNU TLS OpenSSL compatibility], - gnutls/openssl.h, gnutls-openssl, - MD5_Init) + # GnuTLS 2.2.0 changed libgnutls-openssl from GPLv2+ + # to GPLv3+. Don't link that with the GPLv2 ELinks. + # ELinks will use its internal MD5 code instead. + CONFIG_GNUTLS_OPENSSL_COMPAT=no else if test -n "$gnutls_withval" && test "x$gnutls_withval" != xno; then AC_MSG_ERROR([GNUTLS (1.2 or later) not found. ELinks no longer supports GNUTLS 1.1.])