[Emacs-diffs] trunk r114887: Support libpng DLLs of versions beyond 1.4.x on MS-Windows.

[Eli Zaretskii]

------------------------------------------------------------
revno: 114887
revision-id: address@hidden
parent: address@hidden
author: Claudio Bley <address@hidden>
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Fri 2013-11-01 10:57:55 +0200
message:
  Support libpng DLLs of versions beyond 1.4.x on MS-Windows.
  
   lisp/term/w32-win.el (dynamic-library-alist): Support versions of
   libpng beyond 1.4.x.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/term/w32-win.el           w32win.el-20091113204419-o5vbwnq5f7feedwu-943

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-11-01 08:52:22 +0000
+++ b/lisp/ChangeLog    2013-11-01 08:57:55 +0000
@@ -3,6 +3,7 @@
        * term/w32-win.el (dynamic-library-alist): Support newer versions
        of libjpeg starting with v7: look only for the DLL from the
        version against which Emacs was built.
+       Support versions of libpng beyond 1.4.x.
 
 2013-11-01  Bozhidar Batsov  <address@hidden>
 

=== modified file 'lisp/term/w32-win.el'
--- a/lisp/term/w32-win.el      2013-11-01 08:52:22 +0000
+++ b/lisp/term/w32-win.el      2013-11-01 08:57:55 +0000
@@ -216,8 +216,15 @@
        ;; 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")
+          (let ((major (/ libpng-version 10000))
+                (minor (mod (/ libpng-version 100) 10)))
+            (list 'png
+                  ;; libpngXY.dll is the default name when building
+                  ;; with CMake or from a lpngXYY tarball on w32,
+                  ;; libpngXY-XY.dll is the DLL name when building
+                  ;; with libtool / autotools
+                  (format "libpng%d%d.dll" major minor)
+                  (format "libpng%d%d-%d%d.dll" major minor major minor)))
         '(png "libpng12d.dll" "libpng12.dll" "libpng3.dll" "libpng.dll"
               ;; these are libpng 1.2.8 from GTK+
               "libpng13d.dll" "libpng13.dll"))