Print this page


Split Close
Expand all
Collapse all
          --- old/common/autoconf/lib-freetype.m4
          +++ new/common/autoconf/lib-freetype.m4
↓ open down ↓ 350 lines elided ↑ open up ↑
 351  351  
 352  352            if test "x$OPENJDK_TARGET_OS" = xmacosx; then
 353  353              if test "x$FOUND_FREETYPE" != xyes; then
 354  354                # Due to changes in OSX 10.11 XQuartz now installs to /opt/X11
 355  355                FREETYPE_BASE_DIR="$SYSROOT/opt/X11"
 356  356                LIB_CHECK_POTENTIAL_FREETYPE([$FREETYPE_BASE_DIR/include], [$FREETYPE_BASE_DIR/lib], [well-known location])
 357  357              fi
 358  358            fi
 359  359  
 360  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
 364      -
 365      -          if test "x$FOUND_FREETYPE" != xyes; then
 366  361              FREETYPE_BASE_DIR="$SYSROOT/usr"
 367  362              if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then
 368  363                LIB_CHECK_POTENTIAL_FREETYPE([$FREETYPE_BASE_DIR/include], [$FREETYPE_BASE_DIR/lib/x86_64-linux-gnu], [well-known location])
 369  364              else
 370  365                LIB_CHECK_POTENTIAL_FREETYPE([$FREETYPE_BASE_DIR/include], [$FREETYPE_BASE_DIR/lib/i386-linux-gnu], [well-known location])
 371  366                if test "x$FOUND_FREETYPE" != xyes; then
 372  367                  LIB_CHECK_POTENTIAL_FREETYPE([$FREETYPE_BASE_DIR/include], [$FREETYPE_BASE_DIR/lib32], [well-known location])
 373  368                fi
 374  369              fi
 375  370            fi
↓ open down ↓ 75 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX