diff --git a/configure b/configure index 31f54a33b570aa90643ca43c9f3fb111033a3142..6da7b76f7f439af33bd0eb058dffd822ff66df0e 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 296a15fb855ce8f034e4eac9dde0f0b07947a4e1..68fd4116a3e14ed03dd8909515d27489d5c7dc6e 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