From fdf532b9c915ad9ba72155646d29d0f530fd72ec Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Wed, 15 Apr 2015 18:30:01 -0700 Subject: [PATCH] Port jpeg configuration to Solaris 10 with Sun C * configure.ac: Check for jpeglib 6b by trying to link it, instead of relying on cpp magic that has problems in practice. Check for both jpeglib.h and jerror.h features. Remove special case for mingw32, which should no longer be needed (and if it were needed, should now be addressable by hotwiring emacs_cv_jpeglib). Fixes: bug#20332 --- configure.ac | 76 +++++++++++++++++++++++++++--------------------------------- 1 file changed, 34 insertions(+), 42 deletions(-) diff --git a/configure.ac b/configure.ac index 858cf78..c35e962 100644 --- a/configure.ac +++ b/configure.ac @@ -3189,48 +3189,40 @@ AC_SUBST(LIBXPM) ### mingw32 doesn't use -ljpeg, since it loads the library dynamically. HAVE_JPEG=no LIBJPEG= -if test "${opsys}" = "mingw32"; then - if test "${with_jpeg}" != "no"; then - dnl Checking for jpeglib.h can lose because of a redefinition of - dnl HAVE_STDLIB_H. - AC_CHECK_HEADER(jerror.h, HAVE_JPEG=yes, HAVE_JPEG=no) - fi - 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 6b or later], - [#include - #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]) - fi -elif test "${HAVE_X11}" = "yes" || test "${HAVE_W32}" = "yes"; then - if test "${with_jpeg}" != "no"; then - dnl Checking for jpeglib.h can lose because of a redefinition of - dnl HAVE_STDLIB_H. - AC_CHECK_HEADER(jerror.h, - [AC_CHECK_LIB(jpeg, jpeg_destroy_compress, HAVE_JPEG=yes)]) - fi - - 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 6b or later], - [#include - #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]) - fi - if test "${HAVE_JPEG}" = "yes"; then - LIBJPEG=-ljpeg +if test "${with_jpeg}" != "no"; then + AC_CACHE_CHECK([for jpeglib 6b or later], + [emacs_cv_jpeglib], + [OLD_LIBS=$LIBS + for emacs_cv_jpeglib in yes -ljpeg no; do + case $emacs_cv_jpeglib in + yes) ;; + no) break;; + *) LIBS="$LIBS $emacs_cv_jpeglib";; + esac + AC_LINK_IFELSE( + [AC_LANG_PROGRAM( + [[#undef HAVE_STDLIB_H /* Avoid config.h/jpeglib.h collision. */ + #include /* jpeglib.h needs FILE and size_t. */ + #include + #include + char verify[JPEG_LIB_VERSION < 62 ? -1 : 1]; + struct jpeg_decompress_struct cinfo; + ]], + [[ + jpeg_create_decompress (&cinfo); + WARNMS (&cinfo, JWRN_JPEG_EOF); + jpeg_destroy_decompress (&cinfo); + ]])], + [emacs_link_ok=yes], + [emacs_link_ok=no]) + LIBS=$OLD_LIBS + test $emacs_link_ok = yes && break + done]) + if test "$emacs_cv_jpeglib" != no; then + HAVE_JPEG=yes + AC_DEFINE([HAVE_JPEG], 1, + [Define to 1 if you have the jpeg library (typically -ljpeg).]) + test "$emacs_cv_jpeglib" != yes && LIBJPEG=$emacs_cv_jpeglib fi fi AC_SUBST(LIBJPEG) -- 2.1.0