From 42615597058069c04b00cf2e8d1d6c81260b34bf Mon Sep 17 00:00:00 2001 From: Peter Shipton Date: Tue, 16 Jan 2024 10:58:48 -0500 Subject: [PATCH] Bundle freetype by default to match Semeru builds Bundles freetype on Linux. See https://github.com/adoptium/temurin-build/pull/3557 Signed-off-by: Peter Shipton --- make/autoconf/lib-freetype.m4 | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/make/autoconf/lib-freetype.m4 b/make/autoconf/lib-freetype.m4 index 6a710934247..d9ef0bc3f81 100644 --- a/make/autoconf/lib-freetype.m4 +++ b/make/autoconf/lib-freetype.m4 @@ -23,6 +23,10 @@ # questions. # +# =========================================================================== +# (c) Copyright IBM Corp. 2024, 2024 All Rights Reserved +# =========================================================================== + ################################################################################ # Check if a potential freeype library match is correct and usable ################################################################################ @@ -101,11 +105,6 @@ AC_DEFUN_ONCE([LIB_SETUP_FREETYPE], fi FREETYPE_TO_USE=bundled - if test "x$OPENJDK_TARGET_OS" != "xwindows" && \ - test "x$OPENJDK_TARGET_OS" != "xmacosx" && \ - test "x$OPENJDK_TARGET_OS" != "xaix"; then - FREETYPE_TO_USE=system - fi if test "x$with_freetype" != "x" ; then if test "x$with_freetype" = "xsystem" ; then FREETYPE_TO_USE=system