equal
deleted
inserted
replaced
184 |
184 |
185 if (test "x$FOUND_FREETYPE" != "xyes"); then |
185 if (test "x$FOUND_FREETYPE" != "xyes"); then |
186 FREETYPE_BASE_DIR="$SYSROOT/usr" |
186 FREETYPE_BASE_DIR="$SYSROOT/usr" |
187 if (test "x$OPENJDK_TARGET_CPU_BITS" = "x64"); then |
187 if (test "x$OPENJDK_TARGET_CPU_BITS" = "x64"); then |
188 LIB_CHECK_POTENTIAL_FREETYPE([$FREETYPE_BASE_DIR/include], [$FREETYPE_BASE_DIR/lib/$OPENJDK_TARGET_CPU-linux-gnu], [well-known location]) |
188 LIB_CHECK_POTENTIAL_FREETYPE([$FREETYPE_BASE_DIR/include], [$FREETYPE_BASE_DIR/lib/$OPENJDK_TARGET_CPU-linux-gnu], [well-known location]) |
|
189 if (test "x$FOUND_FREETYPE" != "xyes"); then |
|
190 LIB_CHECK_POTENTIAL_FREETYPE([$FREETYPE_BASE_DIR/include], [$FREETYPE_BASE_DIR/lib64], [well-known location]) |
|
191 fi |
189 else |
192 else |
190 LIB_CHECK_POTENTIAL_FREETYPE([$FREETYPE_BASE_DIR/include], [$FREETYPE_BASE_DIR/lib/i386-linux-gnu], [well-known location]) |
193 LIB_CHECK_POTENTIAL_FREETYPE([$FREETYPE_BASE_DIR/include], [$FREETYPE_BASE_DIR/lib/i386-linux-gnu], [well-known location]) |
191 if (test "x$FOUND_FREETYPE" != "xyes"); then |
194 if (test "x$FOUND_FREETYPE" != "xyes"); then |
192 LIB_CHECK_POTENTIAL_FREETYPE([$FREETYPE_BASE_DIR/include], [$FREETYPE_BASE_DIR/lib32], [well-known location]) |
195 LIB_CHECK_POTENTIAL_FREETYPE([$FREETYPE_BASE_DIR/include], [$FREETYPE_BASE_DIR/lib32], [well-known location]) |
193 fi |
196 fi |