OpenJDK / jdk / jdk
changeset 53597:04b92d6fc45d
8218046: use bundled freetype in the AIX build by default
Reviewed-by: ihse
| author | mbaesken |
|---|---|
| date | Wed, 30 Jan 2019 09:35:07 +0100 |
| parents | bb40a5303c84 |
| children | 69ccc5584e12 |
| files | make/autoconf/lib-freetype.m4 |
| diffstat | 1 files changed, 3 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/make/autoconf/lib-freetype.m4 Fri Feb 01 11:29:31 2019 +0530 +++ b/make/autoconf/lib-freetype.m4 Wed Jan 30 09:35:07 2019 +0100 @@ -92,7 +92,7 @@ # 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 @@ 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