Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use the system zlib on platforms other than Windows #692

Merged
merged 1 commit into from
Sep 13, 2023
Merged

Use the system zlib on platforms other than Windows #692

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions common/autoconf/generated-configure.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4050,7 +4050,7 @@ fi
#

# ===========================================================================
# (c) Copyright IBM Corp. 2021, 2022 All Rights Reserved
# (c) Copyright IBM Corp. 2021, 2023 All Rights Reserved
# ===========================================================================


Expand Down Expand Up @@ -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

###############################################################################
#
Expand Down Expand Up @@ -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
Expand Down
10 changes: 5 additions & 5 deletions common/autoconf/libraries.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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],
Expand Down Expand Up @@ -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
Expand Down
14 changes: 7 additions & 7 deletions jdk/make/closed/autoconf/generated-configure.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4155,7 +4155,7 @@ fi
#

# ===========================================================================
# (c) Copyright IBM Corp. 2021, 2022 All Rights Reserved
# (c) Copyright IBM Corp. 2021, 2023 All Rights Reserved
# ===========================================================================


Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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

###############################################################################
#
Expand Down Expand Up @@ -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
Expand Down