aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
Diffstat (limited to 'lisp')
-rw-r--r--lisp/term/w32-win.el6
1 files changed, 5 insertions, 1 deletions
diff --git a/lisp/term/w32-win.el b/lisp/term/w32-win.el
index b5e6ff34743..b0667e6c4f7 100644
--- a/lisp/term/w32-win.el
+++ b/lisp/term/w32-win.el
@@ -214,6 +214,8 @@ See the documentation of `create-fontset-from-fontset-spec' for the format.")
214(defvar libgif-version) 214(defvar libgif-version)
215(defvar libjpeg-version) 215(defvar libjpeg-version)
216 216
217(defvar libgnutls-version) ; gnutls.c
218
217;;; Set default known names for external libraries 219;;; Set default known names for external libraries
218(setq dynamic-library-alist 220(setq dynamic-library-alist
219 (list 221 (list
@@ -266,7 +268,9 @@ See the documentation of `create-fontset-from-fontset-spec' for the format.")
266 '(gdk-pixbuf "libgdk_pixbuf-2.0-0.dll") 268 '(gdk-pixbuf "libgdk_pixbuf-2.0-0.dll")
267 '(glib "libglib-2.0-0.dll") 269 '(glib "libglib-2.0-0.dll")
268 '(gobject "libgobject-2.0-0.dll") 270 '(gobject "libgobject-2.0-0.dll")
269 '(gnutls "libgnutls-28.dll" "libgnutls-26.dll") 271 (if (>= libgnutls-version 30400)
272 '(gnutls "libgnutls-30.dll")
273 '(gnutls "libgnutls-28.dll" "libgnutls-26.dll"))
270 '(libxml2 "libxml2-2.dll" "libxml2.dll") 274 '(libxml2 "libxml2-2.dll" "libxml2.dll")
271 '(zlib "zlib1.dll" "libz-1.dll"))) 275 '(zlib "zlib1.dll" "libz-1.dll")))
272 276