From 2bb7902ace78618211a57acecf2a8e542f7c1ca4 Mon Sep 17 00:00:00 2001
From: John Cupitt <jcupitt@gmail.com>
Date: Sun, 6 May 2012 11:55:59 +0100
Subject: [PATCH] add libtiff-4 test

---
 ChangeLog    |  3 ++-
 configure.in | 23 +++++++++++++++++------
 2 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 56584e47..2c53c401 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
-19/4/12
+19/4/12 started 7.28.5
 - ifthenelse blend mode was broken
 - small blend speedup
+- default to libtiff-4
 
 17/4/12 started 7.28.4
 - up max buffer size for vipsbuf
diff --git a/configure.in b/configure.in
index 3a082cbb..145a4191 100644
--- a/configure.in
+++ b/configure.in
@@ -534,18 +534,29 @@ if test x"$with_pangoft2" != "xno"; then
 fi
 
 # hmm, these don't have .pc files on ubuntu 5.10, how odd
-FIND_TIFF(
-  [with_tiff=yes],
-  [AC_MSG_WARN([libtiff not found; disabling TIFF support])
-   with_tiff=no
-  ])
-
 FIND_ZIP(
   [with_zip=yes],
   [AC_MSG_WARN([libz not found; disabling ZIP support])
    with_zip=no
   ])
 
+# look for TIFF with pkg-config ... fall back to our tester
+# pkgconfig support for libtiff starts with libtiff-4
+AC_ARG_WITH([tiff], 
+  AS_HELP_STRING([--without-tiff], [build without libtiff (default: test)]))
+
+if test x"$with_tiff" != "xno"; then
+  PKG_CHECK_MODULES(TIFF, libtiff-4,
+    [AC_DEFINE(HAVE_TIFF,1,[define if you have libtiff installed.])
+     with_tiff=yes
+     PACKAGES_USED="$PACKAGES_USED libtiff-4"],
+    [FIND_TIFF(,
+     [AC_MSG_WARN([libtiff not found; disabling TIFF support])
+      with_tiff=no
+     ])
+    ])
+fi
+
 # look for PNG with pkg-config ... fall back to our tester
 AC_ARG_WITH([png], 
   AS_HELP_STRING([--without-png], [build without libpng (default: test)]))