Francois Gouget : configure: The libtiff pkg-config name is libtiff-4.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 6274d97229f66ca94e776814fcf71521ecfbf573
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=6274d97229f66ca94e776814fc...

Author: Francois Gouget 
Date:   Thu Nov  5 18:58:44 2015 +0100

configure: The libtiff pkg-config name is libtiff-4.

Signed-off-by: Francois Gouget 
Signed-off-by: Sebastian Lackner 
Signed-off-by: Alexandre Julliard

---

configure    | 12 ++++++------
 configure.ac |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/configure b/configure
index 31f54a3..6da7b76 100755
--- a/configure
+++ b/configure
@@ -2290,8 +2290,8 @@ Some influential environment variables:
   JPEG_LIBS   Linker flags for libjpeg, overriding pkg-config
   PNG_CFLAGS  C compiler flags for libpng, overriding pkg-config
   PNG_LIBS    Linker flags for libpng, overriding pkg-config
-  TIFF_CFLAGS C compiler flags for libtiff, overriding pkg-config
-  TIFF_LIBS   Linker flags for libtiff, overriding pkg-config
+  TIFF_CFLAGS C compiler flags for libtiff-4, overriding pkg-config
+  TIFF_LIBS   Linker flags for libtiff-4, overriding pkg-config
   MPG123_CFLAGS
               C compiler flags for libmpg123, overriding pkg-config
   MPG123_LIBS Linker flags for libmpg123, overriding pkg-config
@@ -13512,19 +13512,19 @@ if test "x$with_tiff" != "xno"
 then
     if ${TIFF_CFLAGS:+false} :; then :
   if ${PKG_CONFIG+:} false; then :
-  TIFF_CFLAGS=`$PKG_CONFIG --cflags libtiff 2>/dev/null`
+  TIFF_CFLAGS=`$PKG_CONFIG --cflags libtiff-4 2>/dev/null`
 fi
 fi

if ${TIFF_LIBS:+false} :; then :
   if ${PKG_CONFIG+:} false; then :
-  TIFF_LIBS=`$PKG_CONFIG --libs libtiff 2>/dev/null`
+  TIFF_LIBS=`$PKG_CONFIG --libs libtiff-4 2>/dev/null`
 fi
 fi

-$as_echo "$as_me:${as_lineno-$LINENO}: libtiff cflags: $TIFF_CFLAGS" >&5
-$as_echo "$as_me:${as_lineno-$LINENO}: libtiff libs: $TIFF_LIBS" >&5
+$as_echo "$as_me:${as_lineno-$LINENO}: libtiff-4 cflags: $TIFF_CFLAGS" >&5
+$as_echo "$as_me:${as_lineno-$LINENO}: libtiff-4 libs: $TIFF_LIBS" >&5
 ac_save_CPPFLAGS=$CPPFLAGS
 CPPFLAGS="$CPPFLAGS $TIFF_CFLAGS"
 for ac_header in tiffio.h
diff --git a/configure.ac b/configure.ac
index 296a15f..68fd411 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1711,7 +1711,7 @@ WINE_WARNING_WITH(png,[test "x$ac_cv_lib_soname_png" = "x"],
 dnl **** Check for libtiff ****
 if test "x$with_tiff" != "xno"
 then
-    WINE_PACKAGE_FLAGS(TIFF,[libtiff],,,,
+    WINE_PACKAGE_FLAGS(TIFF,[libtiff-4],,,,
         [AC_CHECK_HEADERS([tiffio.h])
         if test "$ac_cv_header_tiffio_h" = "yes"
         then