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

diff --git a/ChangeLog b/ChangeLog
index 4abd9d6e047a1dcca071384f8ac2b20977eefaff..b578d0867b60527a1f086f89f0fa1cda1da13977 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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>
 
        * configure.ac (HAVE_W32): Abort with error message if

diff --git a/configure.ac b/configure.ac
index 209bae9eef924d8718434eef31fa811af5eb7c3d..dd1ab324688fe357ba5d885082aada40084a88b3 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -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])