aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'emacs/23.4/25_all_jpeg-version.patch')
-rw-r--r--emacs/23.4/25_all_jpeg-version.patch25
1 files changed, 0 insertions, 25 deletions
diff --git a/emacs/23.4/25_all_jpeg-version.patch b/emacs/23.4/25_all_jpeg-version.patch
deleted file mode 100644
index 8b82827..0000000
--- a/emacs/23.4/25_all_jpeg-version.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-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])