Allow Emacs on w32 to build against and work with GnuTLS 3.x.

 src/gnutls.c (init_gnutls_functions): Load gnutls_check_version.
 Load gnutls_transport_set_lowat only if GnuTLS version is below
 2.11.1.
 (emacs_gnutls_handshake): Call gnutls_transport_set_lowat only for
 GnuTLS versions below 2.11.1.
 lisp/term/w32-win.el (dynamic-library-alist) <gnutls>: Load
 libgnutls-28.dll, from GnuTLS version 3.x, in preference to
 libgnutls-26.dll.

2 files changed, 7 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c7696651c67..5c9274fdda5 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2012-01-01  Eli Zaretskii  <eliz@gnu.org>
+
+        * term/w32-win.el (dynamic-library-alist) <gnutls>: Load
+        libgnutls-28.dll, from GnuTLS version 3.x, in preference to
+        libgnutls-26.dll.
+
 2011-12-31  Andreas Schwab  <schwab@linux-m68k.org>
 
         * emacs-lisp/bytecomp.el (byte-compile-file): Fix indentation.
diff --git a/lisp/term/w32-win.el b/lisp/term/w32-win.el
index b7f2a69e77b..c7189d15241 100644
--- a/lisp/term/w32-win.el
+++ b/lisp/term/w32-win.el
@@ -210,7 +210,7 @@ See the documentation of `create-fontset-from-fontset-spec' for the format.")
        '(gdk-pixbuf "libgdk_pixbuf-2.0-0.dll")
        '(glib "libglib-2.0-0.dll")
        '(gobject "libgobject-2.0-0.dll")
-       '(gnutls "libgnutls-26.dll")))
+       '(gnutls "libgnutls-28.dll" "libgnutls-26.dll")))
 
 ;;; multi-tty support
 (defvar w32-initialized nil