Module: wine Branch: master Commit: ad5b6be1a9679b37ba5c3701f830648028727c8b URL: https://source.winehq.org/git/wine.git/?a=commit;h=ad5b6be1a9679b37ba5c3701f...
Author: Zebediah Figura zfigura@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@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
configure | 2 +- configure.ac | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/configure b/configure index 425d267ec50..8578764ed5e 100755 --- 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" diff --git a/configure.ac b/configure.ac index fed12f61036..54ef47f767c 100644 --- 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")