equal
deleted
inserted
replaced
284 # On Windows, we will need both .lib and .dll file. |
284 # On Windows, we will need both .lib and .dll file. |
285 if ! test -s "$POTENTIAL_FREETYPE_LIB_PATH/freetype.lib"; then |
285 if ! test -s "$POTENTIAL_FREETYPE_LIB_PATH/freetype.lib"; then |
286 AC_MSG_NOTICE([Could not find $POTENTIAL_FREETYPE_LIB_PATH/freetype.lib. Ignoring location.]) |
286 AC_MSG_NOTICE([Could not find $POTENTIAL_FREETYPE_LIB_PATH/freetype.lib. Ignoring location.]) |
287 FOUND_FREETYPE=no |
287 FOUND_FREETYPE=no |
288 fi |
288 fi |
289 elif test "x$OPENJDK_TARGET_OS" = xsolaris && test "x$OPENJDK_TARGET_CPU" = xx86_64 && test -s "$POTENTIAL_FREETYPE_LIB_PATH/amd64/$FREETYPE_LIB_NAME"; then |
289 elif test "x$OPENJDK_TARGET_OS" = xsolaris \ |
290 # On solaris-x86_86, default is (normally) PATH/lib/amd64. Update our guess! |
290 && test -s "$POTENTIAL_FREETYPE_LIB_PATH$OPENJDK_TARGET_CPU_ISADIR/$FREETYPE_LIB_NAME"; then |
291 POTENTIAL_FREETYPE_LIB_PATH="$POTENTIAL_FREETYPE_LIB_PATH/amd64" |
291 # Found lib in isa dir, use that instead. |
|
292 POTENTIAL_FREETYPE_LIB_PATH="$POTENTIAL_FREETYPE_LIB_PATH$OPENJDK_TARGET_CPU_ISADIR" |
292 fi |
293 fi |
293 fi |
294 fi |
294 fi |
295 fi |
295 |
296 |
296 if test "x$FOUND_FREETYPE" = xyes; then |
297 if test "x$FOUND_FREETYPE" = xyes; then |