Zebediah Figura : xslt: Use win32config.h from the correct directory.
Alexandre Julliard
julliard at winehq.org
Thu May 12 15:55:49 CDT 2022
Module: wine
Branch: master
Commit: c111332d1bd681c4955463939029d5a25138ec4f
URL: https://source.winehq.org/git/wine.git/?a=commit;h=c111332d1bd681c4955463939029d5a25138ec4f
Author: Zebediah Figura <zfigura at 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 at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
configure | 2 +-
configure.ac | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/configure b/configure
index f507d5fe6f0..f77409da444 100755
--- a/configure
+++ b/configure
@@ -13321,7 +13321,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 a405bf1773f..630f0563527 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1142,7 +1142,7 @@ 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(VKD3D, vkd3d, vkd3d, "-I\$(top_srcdir)/libs/vkd3d/include")
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 ****
More information about the wine-cvs
mailing list