Zebediah Figura : tiff: Explictly link to zlib.

[Alexandre Julliard]

Module: wine
Branch: stable
Commit: 83215a3e859198447fce8d9c4c7934ce5a552652
URL:    https://gitlab.winehq.org/wine/wine/-/commit/83215a3e859198447fce8d9c4c7934c...

Author: Zebediah Figura <zfigura(a)codeweavers.com>
Date:   Sat Jan 29 18:53:50 2022 -0600

tiff: Explictly link to zlib.

This normally works because the only module linking to tiff (windowscodecs) also
pulls in static zlib via PNG_PE_LIBS. However, if using shared libpng,
windowscodecs will currently fail to link.

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
(cherry picked from commit ad5b6be1a9679b37ba5c3701f830648028727c8b)
Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org>

---

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

diff --git a/configure b/configure
index 72d2dbe6dbc..5735715f741 100755
--- a/configure
+++ b/configure
@@ -13361,7 +13361,7 @@ printf "%s\n" "$as_me:${as_lineno-$LINENO}: png libs: $PNG_PE_LIBS" >&5
 
 if ${TIFF_PE_LIBS:+false} :
 then :
-  TIFF_PE_LIBS=tiff
+  TIFF_PE_LIBS="tiff \$(ZLIB_PE_LIBS)"
    if ${TIFF_PE_CFLAGS:+false} :
 then :
   TIFF_PE_CFLAGS="-I\$(top_srcdir)/libs/tiff/libtiff"
diff --git a/configure.ac b/configure.ac
index 90a0b985460..2e1ea7b91e5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1104,7 +1104,7 @@ WINE_EXTLIB_FLAGS(JXR, jxr, jxr, "-I\$(top_srcdir)/libs/jxr/jxrgluelib -I\$(top_
 WINE_EXTLIB_FLAGS(LCMS2, lcms2, lcms2, "-I\$(top_srcdir)/libs/lcms2/include")
 WINE_EXTLIB_FLAGS(MPG123, mpg123, mpg123, "-I\$(top_srcdir)/libs/mpg123/src/libmpg123")
 WINE_EXTLIB_FLAGS(PNG, png, "png \$(ZLIB_PE_LIBS)", "-I\$(top_srcdir)/libs/png")
-WINE_EXTLIB_FLAGS(TIFF, tiff, tiff, "-I\$(top_srcdir)/libs/tiff/libtiff")
+WINE_EXTLIB_FLAGS(TIFF, tiff, "tiff \$(ZLIB_PE_LIBS)", "-I\$(top_srcdir)/libs/tiff/libtiff")
 WINE_EXTLIB_FLAGS(XML2, xml2, xml2, "-I\$(top_srcdir)/libs/xml2/include -DLIBXML_STATIC")
 WINE_EXTLIB_FLAGS(XSLT, xslt, xslt, "-I\$(top_srcdir)/libs/xslt -DLIBXSLT_STATIC")
 WINE_EXTLIB_FLAGS(ZLIB, zlib, z, "-I\$(top_srcdir)/libs/zlib -DFAR= -DZ_SOLO")