From 5a7f0a3050ee49f4927c07ba96d02b7dae3a2751 Mon Sep 17 00:00:00 2001 From: Ted Zlatanov Date: Mon, 9 May 2011 05:40:26 -0500 Subject: [PATCH] * configure.in: Require GnuTLS 2.6.x or higher. --- ChangeLog | 4 ++++ configure.in | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index c7038691a32..ee27f4c1492 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2011-05-09 Teodor Zlatanov + + * configure.in: Require GnuTLS 2.6.x or higher. + 2011-05-06 Paul Eggert Use C99's va_copy to avoid undefined behavior on x86-64 GNU/Linux. diff --git a/configure.in b/configure.in index aadb6ebe84c..f46645c1bd2 100644 --- a/configure.in +++ b/configure.in @@ -1977,7 +1977,7 @@ AC_SUBST(LIBSELINUX_LIBS) HAVE_GNUTLS=no HAVE_GNUTLS_CALLBACK_CERTIFICATE_VERIFY=no if test "${with_gnutls}" = "yes" ; then - PKG_CHECK_MODULES([LIBGNUTLS], [gnutls >= 2.2.4], HAVE_GNUTLS=yes, HAVE_GNUTLS=no) + PKG_CHECK_MODULES([LIBGNUTLS], [gnutls >= 2.6.0], HAVE_GNUTLS=yes, HAVE_GNUTLS=no) if test "${HAVE_GNUTLS}" = "yes"; then AC_DEFINE(HAVE_GNUTLS, 1, [Define if using GnuTLS.]) fi @@ -3683,7 +3683,7 @@ echo " Does Emacs use -lgpm? ${HAVE_GPM}" echo " Does Emacs use -ldbus? ${HAVE_DBUS}" echo " Does Emacs use -lgconf? ${HAVE_GCONF}" echo " Does Emacs use -lselinux? ${HAVE_LIBSELINUX}" -echo " Does Emacs use -lgnutls? ${HAVE_GNUTLS}" +echo " Does Emacs use -lgnutls (2.6.x or higher)? ${HAVE_GNUTLS}" echo " Does Emacs use -lxml2? ${HAVE_LIBXML2}" echo " Does Emacs use -lfreetype? ${HAVE_FREETYPE}" -- 2.39.5