Mercurial > jdk8-mips64-public / file comparison
comparison: common/autoconf/libraries.m4
common/autoconf/libraries.m4
- changeset 740
- c0fa87863427
- parent 671
- 653ff6bcf0b1
- child 782
- 21198f51bc7e
equal
deleted
inserted
replaced
| 739:0d1e8518c722 | 740:c0fa87863427 |
|---|---|
| 121 # --x-libraries for the sysroot, if that seems to be correct. | 121 # --x-libraries for the sysroot, if that seems to be correct. |
| 122 if test "x$SYS_ROOT" != "x/"; then | 122 if test "x$SYS_ROOT" != "x/"; then |
| 123 if test "x$x_includes" = xNONE; then | 123 if test "x$x_includes" = xNONE; then |
| 124 if test -f "$SYS_ROOT/usr/X11R6/include/X11/Xlib.h"; then | 124 if test -f "$SYS_ROOT/usr/X11R6/include/X11/Xlib.h"; then |
| 125 x_includes="$SYS_ROOT/usr/X11R6/include" | 125 x_includes="$SYS_ROOT/usr/X11R6/include" |
| 126 elif test -f "$SYS_ROOT/usr/include/X11/Xlib.h"; then | |
| 127 x_includes="$SYS_ROOT/usr/include" | |
| 126 fi | 128 fi |
| 127 fi | 129 fi |
| 128 if test "x$x_libraries" = xNONE; then | 130 if test "x$x_libraries" = xNONE; then |
| 129 if test -f "$SYS_ROOT/usr/X11R6/lib/libX11.so"; then | 131 if test -f "$SYS_ROOT/usr/X11R6/lib/libX11.so"; then |
| 130 x_libraries="$SYS_ROOT/usr/X11R6/lib" | 132 x_libraries="$SYS_ROOT/usr/X11R6/lib" |
| 133 elif test "$SYS_ROOT/usr/lib64/libX11.so" && test "x$OPENJDK_TARGET_CPU_BITS" = x64; then | |
| 134 x_libraries="$SYS_ROOT/usr/lib64" | |
| 135 elif test -f "$SYS_ROOT/usr/lib/libX11.so"; then | |
| 136 x_libraries="$SYS_ROOT/usr/lib" | |
| 131 fi | 137 fi |
| 132 fi | 138 fi |
| 133 fi | 139 fi |
| 134 | 140 |
| 135 # Now let autoconf do it's magic | 141 # Now let autoconf do it's magic |
| 151 # Since the X11R6 directory has disappeared on later Linuxes, | 157 # Since the X11R6 directory has disappeared on later Linuxes, |
| 152 # we need to probe for it. | 158 # we need to probe for it. |
| 153 if test "x$OPENJDK_TARGET_OS" = xlinux; then | 159 if test "x$OPENJDK_TARGET_OS" = xlinux; then |
| 154 if test -d "$SYS_ROOT/usr/X11R6"; then | 160 if test -d "$SYS_ROOT/usr/X11R6"; then |
| 155 OPENWIN_HOME="$SYS_ROOT/usr/X11R6" | 161 OPENWIN_HOME="$SYS_ROOT/usr/X11R6" |
| 156 fi | 162 elif test -d "$SYS_ROOT/usr/include/X11"; then |
| 157 if test -d "$SYS_ROOT/usr/include/X11"; then | |
| 158 OPENWIN_HOME="$SYS_ROOT/usr" | 163 OPENWIN_HOME="$SYS_ROOT/usr" |
| 159 fi | 164 fi |
| 160 fi | 165 fi |
| 161 if test "x$OPENJDK_TARGET_OS" = xsolaris; then | 166 if test "x$OPENJDK_TARGET_OS" = xsolaris; then |
| 162 OPENWIN_HOME="/usr/openwin" | 167 OPENWIN_HOME="/usr/openwin" |
| 357 fi | 362 fi |
| 358 fi | 363 fi |
| 359 if test "x$FREETYPE2_FOUND" = xno; then | 364 if test "x$FREETYPE2_FOUND" = xno; then |
| 360 AC_MSG_CHECKING([for freetype in some standard locations]) | 365 AC_MSG_CHECKING([for freetype in some standard locations]) |
| 361 | 366 |
| 362 if test -s /usr/X11/include/ft2build.h && test -d /usr/X11/include/freetype2/freetype; then | 367 if test -s $SYS_ROOT/usr/X11/include/ft2build.h && test -d $SYS_ROOT/usr/X11/include/freetype2/freetype; then |
| 363 DEFAULT_FREETYPE_CFLAGS="-I/usr/X11/include/freetype2 -I/usr/X11/include" | 368 DEFAULT_FREETYPE_CFLAGS="-I$SYS_ROOT/usr/X11/include/freetype2 -I$SYS_ROOT/usr/X11/include" |
| 364 DEFAULT_FREETYPE_LIBS="-L/usr/X11/lib -lfreetype" | 369 DEFAULT_FREETYPE_LIBS="-L$SYS_ROOT/usr/X11/lib -lfreetype" |
| 365 fi | 370 fi |
| 366 if test -s /usr/include/ft2build.h && test -d /usr/include/freetype2/freetype; then | 371 if test -s $SYS_ROOT/usr/include/ft2build.h && test -d $SYS_ROOT/usr/include/freetype2/freetype; then |
| 367 DEFAULT_FREETYPE_CFLAGS="-I/usr/include/freetype2" | 372 DEFAULT_FREETYPE_CFLAGS="-I$SYS_ROOT/usr/include/freetype2" |
| 368 DEFAULT_FREETYPE_LIBS="-lfreetype" | 373 DEFAULT_FREETYPE_LIBS="-lfreetype" |
| 369 fi | 374 fi |
| 370 | 375 |
| 371 PREV_CXXCFLAGS="$CXXFLAGS" | 376 PREV_CXXCFLAGS="$CXXFLAGS" |
| 372 PREV_LDFLAGS="$LDFLAGS" | 377 PREV_LDFLAGS="$LDFLAGS" |
