# HG changeset patch
# User simonis
# Date 1541668653 -3600
#      Thu Nov 08 10:17:33 2018 +0100
# Node ID b623124b8c8f272d599109eca5e1738a5d3a5ed9
# Parent  44f34d2c32435ebb3496a0038cb53a076ad35124
8213515: Improve freetype detection on linux/ppc64/ppc64le/s390x

diff --git a/make/autoconf/lib-freetype.m4 b/make/autoconf/lib-freetype.m4
--- a/make/autoconf/lib-freetype.m4
+++ b/make/autoconf/lib-freetype.m4
@@ -186,6 +186,10 @@
           FREETYPE_BASE_DIR="$SYSROOT/usr"
           if (test "x$OPENJDK_TARGET_CPU_BITS" = "x64"); then
             LIB_CHECK_POTENTIAL_FREETYPE([$FREETYPE_BASE_DIR/include], [$FREETYPE_BASE_DIR/lib/$OPENJDK_TARGET_CPU-linux-gnu], [well-known location])
+            if (test "x$FOUND_FREETYPE" != "xyes"); then
+              # On ppc64/ppc64le/s390x the 64-bit libraries may be under 'lib64/'
+              LIB_CHECK_POTENTIAL_FREETYPE([$FREETYPE_BASE_DIR/include], [$FREETYPE_BASE_DIR/lib64], [well-known location])
+            fi
           else
             LIB_CHECK_POTENTIAL_FREETYPE([$FREETYPE_BASE_DIR/include], [$FREETYPE_BASE_DIR/lib/i386-linux-gnu], [well-known location])
             if (test "x$FOUND_FREETYPE" != "xyes"); then