common/autoconf/generated-configure.sh

*** 4948,4958 ****
  # definitions. It is replaced with custom functionality when building
  # custom sources.
  #CUSTOM_AUTOCONF_INCLUDE
  
  # Do not change or remove the following line, it is needed for consistency checks:
! DATE_WHEN_GENERATED=1458558778
  
  ###############################################################################
  #
  # Initialization / Boot-strapping
  #
--- 4948,4958 ----
  # definitions. It is replaced with custom functionality when building
  # custom sources.
  #CUSTOM_AUTOCONF_INCLUDE
  
  # Do not change or remove the following line, it is needed for consistency checks:
! DATE_WHEN_GENERATED=1458755892
  
  ###############################################################################
  #
  # Initialization / Boot-strapping
  #
*** 61705,61718 ****
  
  
    { $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; then
-     # On macosx default is system...on others default is bundled
      DEFAULT_ZLIB=system
    fi
  
    if test "x${ZLIB_FOUND}" != "xyes"; then
      # If we don't find any system...set default to bundled
      DEFAULT_ZLIB=bundled
--- 61705,61718 ----
  
  
    { $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=system
+   if test "x$OPENJDK_TARGET_OS" = xwindows; then
+     # On windows default is bundled...on others default is system
+     DEFAULT_ZLIB=bundled
    fi
  
    if test "x${ZLIB_FOUND}" != "xyes"; then
      # If we don't find any system...set default to bundled
      DEFAULT_ZLIB=bundled