From: Michael Gilbert <mgilbert@debian.org>
Date: Wed, 12 Oct 2022 00:18:28 +0000 (+0100)
Subject: build using system zlib
X-Git-Tag: archive/raspbian/7.0_repack-10+rpi1~2^2~34
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=25a9a54e86b7d3b1392e2d8a056ee90db940aea7;p=wine.git

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 184e701..69831ee 100644
--- 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 632cfcc..f3649a4 100644
--- 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;