Module: wine Branch: oldstable Commit: 762832316475fc211b0954f529529ce987ac19dc URL: https://gitlab.winehq.org/wine/wine/-/commit/762832316475fc211b0954f529529ce...
Author: Zebediah Figura zfigura@codeweavers.com Date: Wed May 11 17:07:02 2022 -0500
xslt: Use win32config.h from the correct directory.
This also fixes the build with external libxml2 but bundled libxslt.
Signed-off-by: Zebediah Figura zfigura@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org (cherry picked from commit c111332d1bd681c4955463939029d5a25138ec4f) Signed-off-by: Michael Stefaniuc mstefani@winehq.org
---
configure | 2 +- configure.ac | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/configure b/configure index 9938e124014..163b65c2b8a 100755 --- a/configure +++ b/configure @@ -13394,7 +13394,7 @@ then : XSLT_PE_LIBS=xslt if ${XSLT_PE_CFLAGS:+false} : then : - XSLT_PE_CFLAGS="-I$(top_srcdir)/libs/xslt -DLIBXSLT_STATIC" + XSLT_PE_CFLAGS="-I$(top_srcdir)/libs/xslt/libxslt -I$(top_srcdir)/libs/xslt -DLIBXSLT_STATIC" else $as_nop enable_xslt=no fi diff --git a/configure.ac b/configure.ac index 2e1ea7b91e5..1e89771c2e7 100644 --- a/configure.ac +++ b/configure.ac @@ -1106,7 +1106,7 @@ WINE_EXTLIB_FLAGS(MPG123, mpg123, mpg123, "-I$(top_srcdir)/libs/mpg123/src/libm WINE_EXTLIB_FLAGS(PNG, png, "png $(ZLIB_PE_LIBS)", "-I$(top_srcdir)/libs/png") 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(XSLT, xslt, xslt, "-I$(top_srcdir)/libs/xslt/libxslt -I$(top_srcdir)/libs/xslt -DLIBXSLT_STATIC") WINE_EXTLIB_FLAGS(ZLIB, zlib, z, "-I$(top_srcdir)/libs/zlib -DFAR= -DZ_SOLO")
dnl **** Check for pthread ****