[PATCH 2/5] w32: add support for recent PNG library version >= 1.5

[Claudio Bley]

---
 lisp/term/w32-win.el | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/lisp/term/w32-win.el b/lisp/term/w32-win.el
index b1e7d9b..9db771b 100644
--- a/lisp/term/w32-win.el
+++ b/lisp/term/w32-win.el
@@ -215,12 +215,16 @@ See the documentation of 
`create-fontset-from-fontset-spec' for the format.")
        ;; 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"))
+       (if (>= libpng-version 10500)
+          (let ((major (/ libpng-version 10000))
+                (minor (mod (/ libpng-version 100) 10)))
+            (list 'png (format "libpng%d%d.dll" major minor)))
+        (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")))
        '(tiff "libtiff3.dll" "libtiff.dll")
        (if (> jpeglib-version 0)
           (list 'jpeg (format "libjpeg-%d.dll" (/ jpeglib-version 10)))
-- 
1.8.4.msysgit.0

-- 
Claudio
-- 
Claudio