Skip to content

Commit f02ca58

Browse files
authored
Merge pull request ibmruntimes#726 from pshipton/freetype
Bundle freetype by default to match Semeru builds
2 parents cff8650 + d819390 commit f02ca58

File tree

1 file changed

+4
-5
lines changed

1 file changed

+4
-5
lines changed

make/autoconf/lib-freetype.m4

+4-5
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,10 @@
2323
# questions.
2424
#
2525

26+
# ===========================================================================
27+
# (c) Copyright IBM Corp. 2024, 2024 All Rights Reserved
28+
# ===========================================================================
29+
2630
################################################################################
2731
# Check if a potential freeype library match is correct and usable
2832
################################################################################
@@ -101,11 +105,6 @@ AC_DEFUN_ONCE([LIB_SETUP_FREETYPE],
101105
fi
102106
103107
FREETYPE_TO_USE=bundled
104-
if test "x$OPENJDK_TARGET_OS" != "xwindows" && \
105-
test "x$OPENJDK_TARGET_OS" != "xmacosx" && \
106-
test "x$OPENJDK_TARGET_OS" != "xaix"; then
107-
FREETYPE_TO_USE=system
108-
fi
109108
if test "x$with_freetype" != "x" ; then
110109
if test "x$with_freetype" = "xsystem" ; then
111110
FREETYPE_TO_USE=system

0 commit comments

Comments
 (0)