build using system zlib

forwarded: not-needed

Gbp-Pq: Topic system
Gbp-Pq: Name zlib.patch

diff --git a/configure.ac b/configure.ac
index 184e7015d572a0e9570460bcd2b0d50eb4adbb55..69831ee9ac479dd2c209a10284a69b032e3011d2 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -3522,7 +3522,6 @@ WINE_CONFIG_MAKEFILE(libs/wine)
 WINE_CONFIG_MAKEFILE(libs/wmcodecdspuuid)
 WINE_CONFIG_MAKEFILE(libs/xml2)
 WINE_CONFIG_MAKEFILE(libs/xslt)
-WINE_CONFIG_MAKEFILE(libs/zlib)
 WINE_CONFIG_MAKEFILE(loader)
 WINE_CONFIG_MAKEFILE(nls)
 WINE_CONFIG_MAKEFILE(po)

diff --git a/tools/makedep.c b/tools/makedep.c
index 632cfcc17035277087129389c65bf901771ccc9f..f3649a402e48da4c26bf29b512c98d0c6cdef6e4 100644 (file)
--- a/tools/makedep.c
+++ b/tools/makedep.c
@@ -1418,6 +1418,7 @@ static struct file *open_include_file( const struct makefile *make, struct incl_
     if (pFile->type == INCL_SYSTEM && pFile->use_msvcrt &&
         !make->extlib && !pFile->included_by->is_external)
     {
+        if (!strcmp( pFile->name, "zlib.h" )) return NULL;
         if (!strcmp( pFile->name, "stdarg.h" )) return NULL;
         if (!strcmp( pFile->name, "x86intrin.h" )) return NULL;
         if (has_external_import( make )) return NULL;