Merge changes from emacs-23 branch

1 files changed, 19 insertions, 11 deletions

diff --git a/lisp/term/w32-win.el b/lisp/term/w32-win.el
index a1ab5a8225c..df4057aba24 100644
--- a/lisp/term/w32-win.el
+++ b/lisp/term/w32-win.el
@@ -190,17 +190,25 @@ See the documentation of `create-fontset-from-fontset-spec' for the format.")
 
 ;;; Set default known names for external libraries
 (setq dynamic-library-alist
-      '((xpm "libxpm.dll" "xpm4.dll" "libXpm-nox4.dll")
-        (png "libpng12d.dll" "libpng12.dll" "libpng.dll"
-	 ;; these are libpng 1.2.8 from GTK+
-	 "libpng13d.dll" "libpng13.dll")
-        (jpeg "jpeg62.dll" "libjpeg.dll" "jpeg-62.dll" "jpeg.dll")
-        (tiff "libtiff3.dll" "libtiff.dll")
-        (gif "giflib4.dll" "libungif4.dll" "libungif.dll")
-        (svg "librsvg-2-2.dll")
-        (gdk-pixbuf "libgdk_pixbuf-2.0-0.dll")
-        (glib "libglib-2.0-0.dll")
-	(gobject "libgobject-2.0-0.dll")))
+      (list
+       '(xpm "libxpm.dll" "xpm4.dll" "libXpm-nox4.dll")
+       ;; Versions of libpng 1.4.x and later are incompatible with
+       ;; earlier versions.  Set up the list of libraries according to
+       ;; the version we were compiled against.  (If we were compiled
+       ;; without PNG support, libpng-version's value is -1.)
+       (if (>= libpng-version 10400)
+	   ;; libpng14-14.dll is libpng 1.4.3 from GTK+
+	   '(png "libpng14-14.dll" "libpng14.dll")
+	 '(png "libpng12d.dll" "libpng12.dll" "libpng3.dll" "libpng.dll"
+	       ;; these are libpng 1.2.8 from GTK+
+	       "libpng13d.dll" "libpng13.dll"))
+        '(jpeg "jpeg62.dll" "libjpeg.dll" "jpeg-62.dll" "jpeg.dll")
+        '(tiff "libtiff3.dll" "libtiff.dll")
+        '(gif "giflib4.dll" "libungif4.dll" "libungif.dll")
+        '(svg "librsvg-2-2.dll")
+        '(gdk-pixbuf "libgdk_pixbuf-2.0-0.dll")
+        '(glib "libglib-2.0-0.dll")
+	'(gobject "libgobject-2.0-0.dll")))
 
 ;;; multi-tty support
 (defvar w32-initialized nil