[Emacs-diffs] /srv/bzr/emacs/trunk r104168: * configure.in: Require GnuTLS 2.6.x or higher.

[Ted Zlatanov]

------------------------------------------------------------
revno: 104168
committer: Ted Zlatanov <address@hidden>
branch nick: quickfixes
timestamp: Mon 2011-05-09 05:40:26 -0500
message:
  * configure.in: Require GnuTLS 2.6.x or higher.
modified:
  ChangeLog
  configure.in

=== modified file 'ChangeLog'
--- a/ChangeLog 2011-05-06 07:13:19 +0000
+++ b/ChangeLog 2011-05-09 10:40:26 +0000
@@ -1,3 +1,7 @@
+2011-05-09  Teodor Zlatanov  <address@hidden>
+
+       * configure.in: Require GnuTLS 2.6.x or higher.
+
 2011-05-06  Paul Eggert  <address@hidden>
 
        Use C99's va_copy to avoid undefined behavior on x86-64 GNU/Linux.

=== modified file 'configure.in'
--- a/configure.in      2011-04-29 07:55:57 +0000
+++ b/configure.in      2011-05-09 10:40:26 +0000
@@ -1977,7 +1977,7 @@
 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 -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}"