import some changes that somehow happened in the packaging process. bookworm-staging archive/raspbian/7.0_repack-10+rpi1 raspbian/7.0_repack-10+rpi1
authorPeter Michael Green <plugwash@raspbian.org>
Fri, 11 Nov 2022 08:09:23 +0000 (08:09 +0000)
committerPeter Michael Green <plugwash@raspbian.org>
Fri, 11 Nov 2022 08:09:23 +0000 (08:09 +0000)
configure.ac
tools/makedep.c

index 94c8787868f9821d7f4476042ac222a9740b2853..c38dd25f20cd9924cf3c33834abbeb1c2f368ff8 100644 (file)
@@ -3504,6 +3504,7 @@ 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)
index a7acba20116a383400229f63b4b053f8f6beb39a..1c4562345429c4a2b4533b31449b1843f28f5159 100644 (file)
@@ -1418,7 +1418,6 @@ 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;