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@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

tiff: Explictly link to zlib.
ad5b6be1 · Zebediah Figura · Alexandre Julliard · 0959b2ac · ad5b6be1 · ad5b6be1
Commit ad5b6be1 authored Jan 29, 2022 by Zebediah Figura Committed by Alexandre Julliard Jan 31, 2022
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

configure configure +1 -1

configure.ac configure.ac +1 -1

No files found.
--- a/configure
+++ b/configure
@@ -13359,7 +13359,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"

--- a/configure.ac
+++ b/configure.ac
@@ -1102,7 +1102,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")