48 lines
2.0 KiB
Diff
48 lines
2.0 KiB
Diff
From aaabc15214c3668a43cde1e6efe5760993ce176f Mon Sep 17 00:00:00 2001
|
|
From: Kalev Lember <klember@redhat.com>
|
|
Date: Wed, 16 Aug 2017 13:39:18 +0200
|
|
Subject: [PATCH] Revert "build: Check for libtiff using pkg-config"
|
|
|
|
This reverts commit 0927eb3e278e998248f3022c096b4f93685c6a9d.
|
|
---
|
|
configure.ac | 20 +++++++++++++++-----
|
|
1 file changed, 15 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/configure.ac b/configure.ac
|
|
index 76c8adb63..a19cc0f51 100644
|
|
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
@@ -453,14 +453,24 @@ AC_ARG_WITH(gdiplus,
|
|
AM_CONDITIONAL(BUILD_GDIPLUS_LOADERS, [ test x$os_win32 = xyes && test x$with_gdiplus != xno ])
|
|
|
|
dnl Test for libtiff
|
|
-libtiff_found=no
|
|
if test x$os_win32 = xno || test x$with_gdiplus = xno; then
|
|
- if test x$with_libtiff != xno; then
|
|
- PKG_CHECK_MODULES(TIFF, libtiff-4)
|
|
- libtiff_found=yes
|
|
+ if test x$with_libtiff != xno && test -z "$LIBTIFF"; then
|
|
+ AC_CHECK_LIB(tiff, TIFFReadRGBAImageOriented,
|
|
+ [AC_CHECK_HEADER(tiffio.h,
|
|
+ TIFF='tiff'; LIBTIFF='-ltiff',
|
|
+ AC_MSG_WARN(*** TIFF loader will not be built (TIFF header files not found) ***))],
|
|
+ [AC_CHECK_LIB(tiff, TIFFWriteScanline,
|
|
+ [AC_CHECK_HEADER(tiffio.h,
|
|
+ TIFF='tiff'; LIBTIFF='-ltiff -ljpeg -lz',
|
|
+ AC_MSG_WARN(*** TIFF loader will not be built (TIFF header files not found) ***))],
|
|
+ [AC_CHECK_LIB(tiff34, TIFFFlushData,
|
|
+ [AC_CHECK_HEADER(tiffio.h,
|
|
+ TIFF='tiff'; LIBTIFF='-ltiff34 -ljpeg -lz',
|
|
+ AC_MSG_WARN(*** TIFF loader will not be built (TIFF header files not found) ***))],
|
|
+ AC_MSG_WARN(*** TIFF loader will not be built (TIFF library not found) ***), -ljpeg -lz -lm)], -ljpeg -lz -lm)], -lm)
|
|
fi
|
|
|
|
- if test x$with_libtiff != xno && test x$libtiff_found = xno; then
|
|
+ if test x$with_libtiff != xno && test -z "$LIBTIFF"; then
|
|
AC_MSG_ERROR([
|
|
*** Checks for TIFF loader failed. You can build without it by passing
|
|
*** --without-libtiff to configure but some programs using GTK+ may
|
|
--
|
|
2.13.0
|
|
|