procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Andreas Schwab 2015-03-23 11:55:24 +01:00
parent 90b46f5b54
commit ff3878d749
2 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
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> 2015-01-20 Eli Zaretskii <eliz@gnu.org>
* configure.ac (HAVE_W32): Abort with error message if * configure.ac (HAVE_W32): Abort with error message if

18
configure.ac
View file

@ -3075,10 +3075,12 @@ if test "${opsys}" = "mingw32"; then
AH_TEMPLATE(HAVE_JPEG, [Define to 1 if you have the jpeg library (-ljpeg).])dnl AH_TEMPLATE(HAVE_JPEG, [Define to 1 if you have the jpeg library (-ljpeg).])dnl
if test "${HAVE_JPEG}" = "yes"; then if test "${HAVE_JPEG}" = "yes"; then
AC_DEFINE(HAVE_JPEG) 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> [#include <jpeglib.h>
version=JPEG_LIB_VERSION #if JPEG_LIB_VERSION >= 62
], version 6b or later
#endif
],
[AC_DEFINE(HAVE_JPEG)], [AC_DEFINE(HAVE_JPEG)],
[AC_MSG_WARN([libjpeg found, but not version 6b or later]) [AC_MSG_WARN([libjpeg found, but not version 6b or later])
HAVE_JPEG=no]) 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 AH_TEMPLATE(HAVE_JPEG, [Define to 1 if you have the jpeg library (-ljpeg).])dnl
if test "${HAVE_JPEG}" = "yes"; then if test "${HAVE_JPEG}" = "yes"; then
AC_DEFINE(HAVE_JPEG) 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> [#include <jpeglib.h>
version=JPEG_LIB_VERSION #if JPEG_LIB_VERSION >= 62
], version 6b or later
#endif
],
[AC_DEFINE(HAVE_JPEG)], [AC_DEFINE(HAVE_JPEG)],
[AC_MSG_WARN([libjpeg found, but not version 6b or later]) [AC_MSG_WARN([libjpeg found, but not version 6b or later])
HAVE_JPEG=no]) HAVE_JPEG=no])