Increase required GnuTLS version (bug#9929)

* configure.in: Increase minimum GnuTLS version to 2.6.6.
Do not include GnuTLS version info in final summary message.

* etc/NEWS: Add FIXME related to GnuTLS version.

3 files changed, 9 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 3d8f5758afa..f41fe08d872 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-11-04  Glenn Morris  <rgm@gnu.org>
+
+        * configure.in: Increase minimum GnuTLS version to 2.6.6. (Bug#9929)
+        Do not include GnuTLS version info in final summary message.
+
 2011-10-31  Eli Zaretskii  <eliz@gnu.org>
 
         * config.bat: Use config.in and Makefile.in from src/ and lib/, if
diff --git a/configure.in b/configure.in
index 54fba2553bb..5067aac3d1d 100644
--- a/configure.in
+++ b/configure.in
@@ -2063,7 +2063,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.6.0], HAVE_GNUTLS=yes, HAVE_GNUTLS=no)
+  PKG_CHECK_MODULES([LIBGNUTLS], [gnutls >= 2.6.6], HAVE_GNUTLS=yes, HAVE_GNUTLS=no)
   if test "${HAVE_GNUTLS}" = "yes"; then
     AC_DEFINE(HAVE_GNUTLS, 1, [Define if using GnuTLS.])
   fi
@@ -3720,7 +3720,7 @@ echo "  Does Emacs use -ldbus?                                  ${HAVE_DBUS}"
 echo "  Does Emacs use -lgconf?                                 ${HAVE_GCONF}"
 echo "  Does Emacs use GSettings?                               ${HAVE_GSETTINGS}"
 echo "  Does Emacs use -lselinux?                               ${HAVE_LIBSELINUX}"
-echo "  Does Emacs use -lgnutls (2.6.x or higher)?              ${HAVE_GNUTLS}"
+echo "  Does Emacs use -lgnutls?                                ${HAVE_GNUTLS}"
 echo "  Does Emacs use -lxml2?                                  ${HAVE_LIBXML2}"
 
 echo "  Does Emacs use -lfreetype?                              ${HAVE_FREETYPE}"
diff --git a/etc/NEWS b/etc/NEWS
index bd2f6004d39..333da66eb04 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -1294,6 +1294,8 @@ functions.  It's easiest to use these functions through
 STARTTLS opportunistically or use plain SSL, depending on your needs.
 
 Only versions 2.8.x and higher or GnuTLS have been tested.
+[FIXME: this statement needs clarifying, given that GnuTLS >= 2.6.6
+is the test used by configure.]
 
 *** gnutls-log-level
 Set `gnutls-log-level' higher than 0 to get debug output.  1 is for