2 files changed, 19 insertions, 5 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 0c76b176a1f..0d58733f4bf 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2013-11-01  Claudio Bley  <claudio.bley@googlemail.com>
+
+        * image.c (Qlibjpeg_version): New variable.
+        (syms_of_image): DEFSYM and initialize it.
+
 2013-10-31  Jan Djärv  <jan.h.d@swipnet.se>
 
         * emacs.c (main): Skip -psn args on OSX even if ! isatty (0).
diff --git a/src/image.c b/src/image.c
index 6691cfc8a10..fca1bb077f6 100644
--- a/src/image.c
+++ b/src/image.c
@@ -87,11 +87,12 @@ typedef struct w32_bitmap_record Bitmap_Record;
 #define x_defined_color w32_defined_color
 #define DefaultDepthOfScreen(screen) (one_w32_display_info.n_cbits)
 
-/* Versions of libpng and libgif that we were compiled with, or -1 if
-   no PNG/GIF support was compiled in.  This is tested by w32-win.el
-   to correctly set up the alist used to search for the respective
-   image libraries.  */
-Lisp_Object Qlibpng_version, Qlibgif_version;
+/* Versions of libpng, libgif, and libjpeg that we were compiled with,
+   or -1 if no PNG/GIF support was compiled in.  This is tested by
+   w32-win.el to correctly set up the alist used to search for the
+   respective image libraries.  */
+Lisp_Object Qlibpng_version, Qlibgif_version, Qlibjpeg_version;
+
 #endif /* HAVE_NTGUI */
 
 #ifdef HAVE_NS
@@ -9411,6 +9412,14 @@ non-numeric, there is no explicit limit on the size of images.  */);
 #else
         make_number (-1)
 #endif
+        );
+  DEFSYM (Qlibjpeg_version, "libjpeg-version");
+  Fset (Qlibjpeg_version,
+#if HAVE_JPEG
+        make_number (JPEG_LIB_VERSION)
+#else
+        make_number (-1)
+#endif
         );
 #endif