< prev index next >

make/autoconf/lib-bundled.m4

Print this page

        

*** 1,7 **** # ! # Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # 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 # published by the Free Software Foundation. Oracle designates this --- 1,7 ---- # ! # Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # 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 # published by the Free Software Foundation. Oracle designates this
*** 24,39 **** # ################################################################################ # Setup bundled libraries. # ! # For libjpeg, giflib, libpng, lcms2 and zlib the source is present in the ! # OpenJDK repository (referred to as "bundled"). Default is to use libjpeg, ! # giflib, libpng and lcms2 libraries as "bundled". The default for zlib is ! # to use the bundled zlib on Windows and AIX, otherwise the external ("system") ! # zlib, if present. However the libs may be replaced by an external ("system") ! # version by the user. ################################################################################ AC_DEFUN_ONCE([LIB_SETUP_BUNDLED_LIBS], [ LIB_SETUP_LIBJPEG LIB_SETUP_GIFLIB --- 24,36 ---- # ################################################################################ # Setup bundled libraries. # ! # For libjpeg, giflib, libpng, lcms2 and zlib, the source is present in the ! # OpenJDK repository. Default is to use these libraries as bundled, but they ! # might be replaced by en external version by the user. ################################################################################ AC_DEFUN_ONCE([LIB_SETUP_BUNDLED_LIBS], [ LIB_SETUP_LIBJPEG LIB_SETUP_GIFLIB
*** 162,173 **** [ ZLIB_FOUND=no ]) AC_MSG_CHECKING([for which zlib to use]) DEFAULT_ZLIB=system ! if test "x$OPENJDK_TARGET_OS" = xwindows -o "x$OPENJDK_TARGET_OS" = xaix; then ! # On windows and aix 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 --- 159,170 ---- [ ZLIB_FOUND=no ]) AC_MSG_CHECKING([for which zlib to use]) 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
< prev index next >