emacs/23.4/25_all_jpeg-version.patch


1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25

Fix jpeg version check to work with gcc >= 5.
Comprises part of the following commit from the emacs-24 branch:

commit ff3878d749591ebf78da532ec1eb6fa00cb5757d
Author: Andreas Schwab <schwab@suse.de>
Date:   Mon Mar 23 11:55:24 2015 +0100

    * configure.ac: Fix jpeg version check to work with gcc >= 5.

--- emacs-23.4-orig/configure.in
+++ emacs-23.4/configure.in
@@ -2176,9 +2176,11 @@
   AH_TEMPLATE(HAVE_JPEG, [Define to 1 if you have the jpeg library (-ljpeg).])dnl
   if test "${HAVE_JPEG}" = "yes"; then
     AC_DEFINE(HAVE_JPEG)
-    AC_EGREP_CPP([version= *(6[2-9]|[7-9][0-9])],
+    AC_EGREP_CPP([version 6b or later],
         [#include <jpeglib.h>
-	 version=JPEG_LIB_VERSION
+	 #if JPEG_LIB_VERSION >= 62
+	 version 6b or later
+	 #endif
 ],
         [AC_DEFINE(HAVE_JPEG)],
         [AC_MSG_WARN([libjpeg found, but not version 6b or later])