Skip to content

GitLab

emacs
emacs
Commit ff3878d7 authored by Andreas Schwab's avatar Andreas Schwab
Browse files
Options

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

parent 90b46f5b
Hide whitespace changes
Inline Side-by-side
Showing with 15 additions and 7 deletions
ChangeLog
View file @ ff3878d7
2015-03-23 Andreas Schwab <schwab@suse.de>
* configure.ac: Fix jpeg version check to work with gcc >= 5.
2015-01-20 Eli Zaretskii <eliz@gnu.org>
* configure.ac (HAVE_W32): Abort with error message if
......
configure.ac
View file @ ff3878d7
......@@ -3075,10 +3075,12 @@ if test "${opsys}" = "mingw32"; then
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])],
[#include <jpeglib.h>
version=JPEG_LIB_VERSION
],
AC_EGREP_CPP([version 6b or later],
[#include <jpeglib.h>
#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])
HAVE_JPEG=no])
......@@ -3094,10 +3096,12 @@ elif test "${HAVE_X11}" = "yes" || test "${HAVE_W32}" = "yes"; then
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])
HAVE_JPEG=no])
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment