equal
deleted
inserted
replaced
1 # |
1 # |
2 # Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. |
2 # Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved. |
3 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
3 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
4 # |
4 # |
5 # This code is free software; you can redistribute it and/or modify it |
5 # This code is free software; you can redistribute it and/or modify it |
6 # under the terms of the GNU General Public License version 2 only, as |
6 # under the terms of the GNU General Public License version 2 only, as |
7 # published by the Free Software Foundation. Oracle designates this |
7 # published by the Free Software Foundation. Oracle designates this |
344 FREETYPE_BASE_DIR="$SYSROOT/usr" |
344 FREETYPE_BASE_DIR="$SYSROOT/usr" |
345 LIB_CHECK_POTENTIAL_FREETYPE([$FREETYPE_BASE_DIR/include], [$FREETYPE_BASE_DIR/lib], [well-known location]) |
345 LIB_CHECK_POTENTIAL_FREETYPE([$FREETYPE_BASE_DIR/include], [$FREETYPE_BASE_DIR/lib], [well-known location]) |
346 |
346 |
347 if test "x$FOUND_FREETYPE" != xyes; then |
347 if test "x$FOUND_FREETYPE" != xyes; then |
348 FREETYPE_BASE_DIR="$SYSROOT/usr/X11" |
348 FREETYPE_BASE_DIR="$SYSROOT/usr/X11" |
|
349 LIB_CHECK_POTENTIAL_FREETYPE([$FREETYPE_BASE_DIR/include], [$FREETYPE_BASE_DIR/lib], [well-known location]) |
|
350 fi |
|
351 if test "x$FOUND_FREETYPE" != xyes; then |
|
352 FREETYPE_BASE_DIR="$SYSROOT/usr/local" |
349 LIB_CHECK_POTENTIAL_FREETYPE([$FREETYPE_BASE_DIR/include], [$FREETYPE_BASE_DIR/lib], [well-known location]) |
353 LIB_CHECK_POTENTIAL_FREETYPE([$FREETYPE_BASE_DIR/include], [$FREETYPE_BASE_DIR/lib], [well-known location]) |
350 fi |
354 fi |
351 |
355 |
352 if test "x$OPENJDK_TARGET_OS" = xmacosx; then |
356 if test "x$OPENJDK_TARGET_OS" = xmacosx; then |
353 if test "x$FOUND_FREETYPE" != xyes; then |
357 if test "x$FOUND_FREETYPE" != xyes; then |