From 64b7dc3514f25399631402270ab54c3e087e8700 Mon Sep 17 00:00:00 2001
From: Peter Shipton <Peter_Shipton@ca.ibm.com>
Date: Tue, 12 Sep 2023 15:11:03 -0400
Subject: [PATCH] Use the system zlib on platforms other than Windows

This makes jdk8 consistent with jdk11.

Issue https://github.com/eclipse-openj9/openj9/issues/18127

Signed-off-by: Peter Shipton <Peter_Shipton@ca.ibm.com>
---
 common/autoconf/generated-configure.sh          | 12 ++++++------
 common/autoconf/libraries.m4                    | 10 +++++-----
 jdk/make/closed/autoconf/generated-configure.sh | 14 +++++++-------
 3 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/common/autoconf/generated-configure.sh b/common/autoconf/generated-configure.sh
index 51da35a3445..d7468b7943f 100644
--- a/common/autoconf/generated-configure.sh
+++ b/common/autoconf/generated-configure.sh
@@ -4050,7 +4050,7 @@ fi
 #
 
 # ===========================================================================
-# (c) Copyright IBM Corp. 2021, 2022 All Rights Reserved
+# (c) Copyright IBM Corp. 2021, 2023 All Rights Reserved
 # ===========================================================================
 
 
@@ -4464,7 +4464,7 @@ VS_TOOLSET_SUPPORTED_2022=true
 #CUSTOM_AUTOCONF_INCLUDE
 
 # Do not change or remove the following line, it is needed for consistency checks:
-DATE_WHEN_GENERATED=1692401469
+DATE_WHEN_GENERATED=1694614546
 
 ###############################################################################
 #
@@ -46345,12 +46345,12 @@ fi
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for which zlib to use" >&5
 $as_echo_n "checking for which zlib to use... " >&6; }
 
-  DEFAULT_ZLIB=bundled
-  if test "x$OPENJDK_TARGET_OS" = xmacosx -o "x$OPENJDK_TARGET_OS" = xaix; then
+  DEFAULT_ZLIB=system
+  if test "x$OPENJDK_TARGET_OS" = xwindows; then
     #
-    # On macosx and aix default is system...on others default is
+    # On windows default is bundled...on others default is system.
     #
-    DEFAULT_ZLIB=system
+    DEFAULT_ZLIB=bundled
   fi
 
   if test "x${ZLIB_FOUND}" != "xyes"; then
diff --git a/common/autoconf/libraries.m4 b/common/autoconf/libraries.m4
index 669fccf8120..a22636d2e17 100644
--- a/common/autoconf/libraries.m4
+++ b/common/autoconf/libraries.m4
@@ -24,7 +24,7 @@
 #
 
 # ===========================================================================
-# (c) Copyright IBM Corp. 2021, 2022 All Rights Reserved
+# (c) Copyright IBM Corp. 2021, 2023 All Rights Reserved
 # ===========================================================================
 
 AC_DEFUN_ONCE([LIB_SETUP_INIT],
@@ -667,12 +667,12 @@ AC_DEFUN_ONCE([LIB_SETUP_MISC_LIBS],
 
   AC_MSG_CHECKING([for which zlib to use])
 
-  DEFAULT_ZLIB=bundled
-  if test "x$OPENJDK_TARGET_OS" = xmacosx -o "x$OPENJDK_TARGET_OS" = xaix; then
+  DEFAULT_ZLIB=system
+  if test "x$OPENJDK_TARGET_OS" = xwindows; then
     #
-    # On macosx and aix default is system...on others default is
+    # On windows default is bundled...on others default is system.
     #
-    DEFAULT_ZLIB=system
+    DEFAULT_ZLIB=bundled
   fi
 
   if test "x${ZLIB_FOUND}" != "xyes"; then
diff --git a/jdk/make/closed/autoconf/generated-configure.sh b/jdk/make/closed/autoconf/generated-configure.sh
index 1a535edcc4e..dd4fdf5aa51 100644
--- a/jdk/make/closed/autoconf/generated-configure.sh
+++ b/jdk/make/closed/autoconf/generated-configure.sh
@@ -4155,7 +4155,7 @@ fi
 #
 
 # ===========================================================================
-# (c) Copyright IBM Corp. 2021, 2022 All Rights Reserved
+# (c) Copyright IBM Corp. 2021, 2023 All Rights Reserved
 # ===========================================================================
 
 
@@ -4567,7 +4567,7 @@ VS_TOOLSET_SUPPORTED_2022=true
 # definitions. It is replaced with custom functionality when building
 # custom sources.
 # ===========================================================================
-# (c) Copyright IBM Corp. 2017, 2022 All Rights Reserved
+# (c) Copyright IBM Corp. 2017, 2023 All Rights Reserved
 # ===========================================================================
 # This code is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License version 2 only, as
@@ -4634,7 +4634,7 @@ VS_TOOLSET_SUPPORTED_2022=true
 
 
 # Do not change or remove the following line, it is needed for consistency checks:
-DATE_WHEN_GENERATED=1692401469
+DATE_WHEN_GENERATED=1694614546
 
 ###############################################################################
 #
@@ -49316,12 +49316,12 @@ fi
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for which zlib to use" >&5
 $as_echo_n "checking for which zlib to use... " >&6; }
 
-  DEFAULT_ZLIB=bundled
-  if test "x$OPENJDK_TARGET_OS" = xmacosx -o "x$OPENJDK_TARGET_OS" = xaix; then
+  DEFAULT_ZLIB=system
+  if test "x$OPENJDK_TARGET_OS" = xwindows; then
     #
-    # On macosx and aix default is system...on others default is
+    # On windows default is bundled...on others default is system.
     #
-    DEFAULT_ZLIB=system
+    DEFAULT_ZLIB=bundled
   fi
 
   if test "x${ZLIB_FOUND}" != "xyes"; then