Permalink
Browse files

configure: Try to check for libjpeg with pkg-config

libjpeg-turbo >= 1.5.0 provides a pkg-config file.
1 parent feac69a commit eaa45ec9c70f2205da61325f84a0c524f8abce4f @bgilbert bgilbert committed Jun 10, 2016
Showing with 7 additions and 3 deletions.
  1. +1 −1 Makefile.am
  2. +6 −2 configure.ac
View
@@ -14,7 +14,7 @@ lib_LTLIBRARIES = src/libopenslide.la
src_libopenslide_la_LIBADD = $(GLIB2_LIBS) $(CAIRO_LIBS) $(SQLITE3_LIBS) \
$(LIBXML2_LIBS) $(OPENJPEG_LIBS) $(LIBTIFF_LIBS) $(LIBPNG_LIBS) \
- $(GDKPIXBUF_LIBS) $(ZLIB_LIBS)
+ $(LIBJPEG_LIBS) $(GDKPIXBUF_LIBS) $(ZLIB_LIBS)
src_libopenslide_la_SOURCES = \
src/openslide.c \
View
@@ -51,14 +51,18 @@ AC_SUBST([SUFFIXED_VERSION])
# libraries
AC_SEARCH_LIBS([floor], [m],, AC_MSG_FAILURE([cannot find math library]))
-AC_SEARCH_LIBS([jpeg_CreateDecompress], [jpeg],,
- AC_MSG_FAILURE([cannot find libjpeg]))
PKG_CHECK_MODULES(ZLIB, [zlib], [], [
dnl for Ubuntu Lucid, BSD
AC_SEARCH_LIBS([inflate], [z],, AC_MSG_FAILURE([cannot find zlib]))
])
+PKG_CHECK_MODULES(LIBJPEG, [libjpeg], [], [
+ dnl IJG libjpeg, or libjpeg-turbo < 1.5.0
+ AC_SEARCH_LIBS([jpeg_CreateDecompress], [jpeg],,
+ AC_MSG_FAILURE([cannot find libjpeg]))
+])
+
PKG_CHECK_MODULES(OPENJPEG2, [libopenjp2 >= 2.1.0], [
AC_DEFINE([HAVE_OPENJPEG2], [1], [Define to 1 if you have OpenJPEG >= 2.1.0.])
OPENJPEG_CFLAGS="$OPENJPEG2_CFLAGS"

0 comments on commit eaa45ec

Please sign in to comment.