configure: Try to check for libjpeg with pkg-config

libjpeg-turbo >= 1.5.0 provides a pkg-config file.
openslide · eaa45ec9c70f2205da61325f84a0c524f8abce4f · bgilbert committed Jun 10, 2016 · Jun 10, 2016 · eaa45ec
1 parent feac69a
commit eaa45ec9c70f2205da61325f84a0c524f8abce4f
Unified Split

Showing with 7 additions and 3 deletions.

+1 −1 Makefile.am

+6 −2 configure.ac
diff --git a/Makefile.am b/Makefile.am
@@ -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 \
diff --git a/configure.ac b/configure.ac
@@ -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"