equal
deleted
inserted
replaced
353 if test "x$FOUND_FREETYPE" != xyes; then |
353 if test "x$FOUND_FREETYPE" != xyes; then |
354 # Due to changes in OSX 10.11 XQuartz now installs to /opt/X11 |
354 # Due to changes in OSX 10.11 XQuartz now installs to /opt/X11 |
355 FREETYPE_BASE_DIR="$SYSROOT/opt/X11" |
355 FREETYPE_BASE_DIR="$SYSROOT/opt/X11" |
356 LIB_CHECK_POTENTIAL_FREETYPE([$FREETYPE_BASE_DIR/include], [$FREETYPE_BASE_DIR/lib], [well-known location]) |
356 LIB_CHECK_POTENTIAL_FREETYPE([$FREETYPE_BASE_DIR/include], [$FREETYPE_BASE_DIR/lib], [well-known location]) |
357 fi |
357 fi |
358 fi |
|
359 |
|
360 if test "x$FOUND_FREETYPE" != xyes; then |
|
361 FREETYPE_BASE_DIR="$SYSROOT/usr/sfw" |
|
362 LIB_CHECK_POTENTIAL_FREETYPE([$FREETYPE_BASE_DIR/include], [$FREETYPE_BASE_DIR/lib], [well-known location]) |
|
363 fi |
358 fi |
364 |
359 |
365 if test "x$FOUND_FREETYPE" != xyes; then |
360 if test "x$FOUND_FREETYPE" != xyes; then |
366 FREETYPE_BASE_DIR="$SYSROOT/usr" |
361 FREETYPE_BASE_DIR="$SYSROOT/usr" |
367 if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then |
362 if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then |