[PATCH 1/4] configure: Try to detect MinGW libpng using pkg-config if --with-system-dllpath is specified.
Signed-off-by: Zebediah Figura zfigura@codeweavers.com --- configure.ac | 9 +++++++++ 1 file changed, 9 insertions(+)
diff --git a/configure.ac b/configure.ac index ea4c19063bf..a4480317d76 100644 --- a/configure.ac +++ b/configure.ac @@ -1073,6 +1073,15 @@ then WINE_NOTICE([libmpg123 ${notice_platform}MinGW development files not found (or too old); using bundled version.]) fi
+ WINE_MINGW_PACKAGE_FLAGS(PNG,[libpng],, + [WINE_CHECK_MINGW_HEADER(png.h, + [WINE_CHECK_MINGW_LIB(png,png_create_read_struct,[:],[PNG_PE_CFLAGS=""; PNG_PE_LIBS=""],[$PNG_PE_LIBS])], + [PNG_PE_CFLAGS=""; PNG_PE_LIBS=""])]) + if test "x$PNG_PE_LIBS" = "x" + then + WINE_NOTICE([libpng ${notice_platform}MinGW development files not found; using bundled version.]) + fi + WINE_MINGW_PACKAGE_FLAGS(ZLIB,[zlib],[-lz], [WINE_CHECK_MINGW_HEADER(zlib.h, [WINE_CHECK_MINGW_LIB(z,inflate,[:],[ZLIB_PE_CFLAGS=""; ZLIB_PE_LIBS=""],[$ZLIB_PE_LIBS])],
Signed-off-by: Zebediah Figura zfigura@codeweavers.com --- configure.ac | 9 +++++++++ 1 file changed, 9 insertions(+)
diff --git a/configure.ac b/configure.ac index a4480317d76..5a15414ccfd 100644 --- a/configure.ac +++ b/configure.ac @@ -1082,6 +1082,15 @@ then WINE_NOTICE([libpng ${notice_platform}MinGW development files not found; using bundled version.]) fi
+ WINE_MINGW_PACKAGE_FLAGS(TIFF,[libtiff-4],, + [WINE_CHECK_MINGW_HEADER(tiffio.h, + [WINE_CHECK_MINGW_LIB(tiff,TIFFClientOpen,[:],[TIFF_PE_CFLAGS=""; TIFF_PE_LIBS=""],[$TIFF_PE_LIBS])], + [TIFF_PE_CFLAGS=""; TIFF_PE_LIBS=""])]) + if test "x$TIFF_PE_LIBS" = "x" + then + WINE_NOTICE([libtiff ${notice_platform}MinGW development files not found; using bundled version.]) + fi + WINE_MINGW_PACKAGE_FLAGS(ZLIB,[zlib],[-lz], [WINE_CHECK_MINGW_HEADER(zlib.h, [WINE_CHECK_MINGW_LIB(z,inflate,[:],[ZLIB_PE_CFLAGS=""; ZLIB_PE_LIBS=""],[$ZLIB_PE_LIBS])],
Signed-off-by: Zebediah Figura zfigura@codeweavers.com --- configure.ac | 16 ++++++++++++++++ 1 file changed, 16 insertions(+)
diff --git a/configure.ac b/configure.ac index 5a15414ccfd..4b11fb97b70 100644 --- a/configure.ac +++ b/configure.ac @@ -1091,6 +1091,22 @@ then WINE_NOTICE([libtiff ${notice_platform}MinGW development files not found; using bundled version.]) fi
+ WINE_MINGW_PACKAGE_FLAGS(XML2,[libxml-2.0],[-lxml2], + [WINE_CHECK_MINGW_HEADER(libxml/parser.h) + WINE_CHECK_MINGW_HEADER(libxml/xmlsave.h) + WINE_CHECK_MINGW_HEADER(libxml/SAX2.h) + if test "$ac_cv_mingw_header_libxml_parser_h" = "yes" -a "$ac_cv_mingw_header_libxml_xmlsave_h" = "yes" -a "$ac_cv_mingw_header_libxml_SAX2_h" = "yes" + then + WINE_CHECK_MINGW_LIB(xml2,xmlFirstElementChild,[:],[XML2_PE_CFLAGS=""; XML2_PE_LIBS=""],[$XML2_PE_LIBS]) + else + XML2_PE_CFLAGS="" + XML2_PE_LIBS="" + fi]) + if test "x$XML2_PE_LIBS" = "x" + then + WINE_NOTICE([libxml2 ${notice_platform}MinGW development files not found (or too old); using bundled version.]) + fi + WINE_MINGW_PACKAGE_FLAGS(ZLIB,[zlib],[-lz], [WINE_CHECK_MINGW_HEADER(zlib.h, [WINE_CHECK_MINGW_LIB(z,inflate,[:],[ZLIB_PE_CFLAGS=""; ZLIB_PE_LIBS=""],[$ZLIB_PE_LIBS])],
Signed-off-by: Zebediah Figura zfigura@codeweavers.com --- configure.ac | 15 +++++++++++++++ 1 file changed, 15 insertions(+)
diff --git a/configure.ac b/configure.ac index 4b11fb97b70..929cbe88e22 100644 --- a/configure.ac +++ b/configure.ac @@ -1107,6 +1107,21 @@ then WINE_NOTICE([libxml2 ${notice_platform}MinGW development files not found (or too old); using bundled version.]) fi
+ WINE_MINGW_PACKAGE_FLAGS(XSLT,[libxslt],[-lxslt], + [WINE_CHECK_MINGW_HEADER(libxslt/pattern.h) + WINE_CHECK_MINGW_HEADER(libxslt/transform.h) + if test "$ac_cv_mingw_header_libxslt_pattern_h" = "yes" -a "$ac_cv_mingw_header_libxslt_transform_h" = "yes" + then + WINE_CHECK_MINGW_LIB(xslt,xsltCompilePattern,[:],[XSLT_PE_CFLAGS=""; XSLT_PE_LIBS=""],[$XSLT_PE_LIBS]) + else + XSLT_PE_CFLAGS="" + XSLT_PE_LIBS="" + fi]) + if test "x$XSLT_PE_LIBS" = "x" + then + WINE_NOTICE([libxslt ${notice_platform}MinGW development files not found; using bundled version.]) + fi + WINE_MINGW_PACKAGE_FLAGS(ZLIB,[zlib],[-lz], [WINE_CHECK_MINGW_HEADER(zlib.h, [WINE_CHECK_MINGW_LIB(z,inflate,[:],[ZLIB_PE_CFLAGS=""; ZLIB_PE_LIBS=""],[$ZLIB_PE_LIBS])],
-
Zebediah Figura