stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8218046: use bundled freetype in the AIX build by default

Browse Source 
Reviewed-by: ihse
This commit is contained in:
Matthias Baesken 2019-01-30 09:35:07 +01:00
parent 55369945b9
commit a69aed8ec5
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
make/autoconf/lib-freetype.m4
View File

@ -92,7 +92,7 @@ AC_DEFUN_ONCE([LIB_SETUP_FREETYPE],
# This setup is to verify access to system installed freetype header and libraries.
# On Windows and MacOS this does not apply and using these options will report an error.
# On other platforms (Linux, Solaris, and perhaps AIX), they will default to using
# On other platforms (Linux, Solaris), they will default to using
# the system libraries. If they are found automatically, nothing need be done.
# If they are not found, the configure "--with-freetype-*" options may be used to fix that.
# If the preference is to bundle on these platforms then use --with-freetype=bundled
@ -106,7 +106,8 @@ AC_DEFUN_ONCE([LIB_SETUP_FREETYPE],
fi
FREETYPE_TO_USE=bundled
if (test "x$OPENJDK_TARGET_OS" != "xwindows" && test "x$OPENJDK_TARGET_OS" != "xmacosx"); then
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