Mercurial > jdk8-mips64-public / file comparison
comparison: common/autoconf/generated-configure.sh
common/autoconf/generated-configure.sh
- changeset 740
- c0fa87863427
- parent 739
- 0d1e8518c722
- child 750
- f5eb23490e6a
- child 822
- b59990653fb9
- child 965
- 3ef3f4174c2b
equal
deleted
inserted
replaced
| 739:0d1e8518c722 | 740:c0fa87863427 |
|---|---|
| 3780 # definitions. It is replaced with custom functionality when building | 3780 # definitions. It is replaced with custom functionality when building |
| 3781 # custom sources. | 3781 # custom sources. |
| 3782 #CUSTOM_AUTOCONF_INCLUDE | 3782 #CUSTOM_AUTOCONF_INCLUDE |
| 3783 | 3783 |
| 3784 # Do not change or remove the following line, it is needed for consistency checks: | 3784 # Do not change or remove the following line, it is needed for consistency checks: |
| 3785 DATE_WHEN_GENERATED=1371547755 | 3785 DATE_WHEN_GENERATED=1371547824 |
| 3786 | 3786 |
| 3787 ############################################################################### | 3787 ############################################################################### |
| 3788 # | 3788 # |
| 3789 # Initialization / Boot-strapping | 3789 # Initialization / Boot-strapping |
| 3790 # | 3790 # |
| 7469 fi | 7469 fi |
| 7470 if test "x$with_tools_dir" != x; then | 7470 if test "x$with_tools_dir" != x; then |
| 7471 as_fn_error $? "Cannot specify both --with-devkit and --with-tools-dir at the same time" "$LINENO" 5 | 7471 as_fn_error $? "Cannot specify both --with-devkit and --with-tools-dir at the same time" "$LINENO" 5 |
| 7472 fi | 7472 fi |
| 7473 TOOLS_DIR=$with_devkit/bin | 7473 TOOLS_DIR=$with_devkit/bin |
| 7474 SYS_ROOT=$with_devkit/$host_alias/libc | 7474 if test -d "$with_devkit/$host_alias/libc"; then |
| 7475 SYS_ROOT=$with_devkit/$host_alias/libc | |
| 7476 elif test -d "$with_devkit/$host/sys-root"; then | |
| 7477 SYS_ROOT=$with_devkit/$host/sys-root | |
| 7478 fi | |
| 7475 | 7479 |
| 7476 fi | 7480 fi |
| 7477 | 7481 |
| 7478 | 7482 |
| 7479 | 7483 |
| 29908 # --x-libraries for the sysroot, if that seems to be correct. | 29912 # --x-libraries for the sysroot, if that seems to be correct. |
| 29909 if test "x$SYS_ROOT" != "x/"; then | 29913 if test "x$SYS_ROOT" != "x/"; then |
| 29910 if test "x$x_includes" = xNONE; then | 29914 if test "x$x_includes" = xNONE; then |
| 29911 if test -f "$SYS_ROOT/usr/X11R6/include/X11/Xlib.h"; then | 29915 if test -f "$SYS_ROOT/usr/X11R6/include/X11/Xlib.h"; then |
| 29912 x_includes="$SYS_ROOT/usr/X11R6/include" | 29916 x_includes="$SYS_ROOT/usr/X11R6/include" |
| 29917 elif test -f "$SYS_ROOT/usr/include/X11/Xlib.h"; then | |
| 29918 x_includes="$SYS_ROOT/usr/include" | |
| 29913 fi | 29919 fi |
| 29914 fi | 29920 fi |
| 29915 if test "x$x_libraries" = xNONE; then | 29921 if test "x$x_libraries" = xNONE; then |
| 29916 if test -f "$SYS_ROOT/usr/X11R6/lib/libX11.so"; then | 29922 if test -f "$SYS_ROOT/usr/X11R6/lib/libX11.so"; then |
| 29917 x_libraries="$SYS_ROOT/usr/X11R6/lib" | 29923 x_libraries="$SYS_ROOT/usr/X11R6/lib" |
| 29924 elif test "$SYS_ROOT/usr/lib64/libX11.so" && test "x$OPENJDK_TARGET_CPU_BITS" = x64; then | |
| 29925 x_libraries="$SYS_ROOT/usr/lib64" | |
| 29926 elif test -f "$SYS_ROOT/usr/lib/libX11.so"; then | |
| 29927 x_libraries="$SYS_ROOT/usr/lib" | |
| 29918 fi | 29928 fi |
| 29919 fi | 29929 fi |
| 29920 fi | 29930 fi |
| 29921 | 29931 |
| 29922 # Now let autoconf do it's magic | 29932 # Now let autoconf do it's magic |
| 30643 # Since the X11R6 directory has disappeared on later Linuxes, | 30653 # Since the X11R6 directory has disappeared on later Linuxes, |
| 30644 # we need to probe for it. | 30654 # we need to probe for it. |
| 30645 if test "x$OPENJDK_TARGET_OS" = xlinux; then | 30655 if test "x$OPENJDK_TARGET_OS" = xlinux; then |
| 30646 if test -d "$SYS_ROOT/usr/X11R6"; then | 30656 if test -d "$SYS_ROOT/usr/X11R6"; then |
| 30647 OPENWIN_HOME="$SYS_ROOT/usr/X11R6" | 30657 OPENWIN_HOME="$SYS_ROOT/usr/X11R6" |
| 30648 fi | 30658 elif test -d "$SYS_ROOT/usr/include/X11"; then |
| 30649 if test -d "$SYS_ROOT/usr/include/X11"; then | |
| 30650 OPENWIN_HOME="$SYS_ROOT/usr" | 30659 OPENWIN_HOME="$SYS_ROOT/usr" |
| 30651 fi | 30660 fi |
| 30652 fi | 30661 fi |
| 30653 if test "x$OPENJDK_TARGET_OS" = xsolaris; then | 30662 if test "x$OPENJDK_TARGET_OS" = xsolaris; then |
| 30654 OPENWIN_HOME="/usr/openwin" | 30663 OPENWIN_HOME="/usr/openwin" |
| 31537 fi | 31546 fi |
| 31538 if test "x$FREETYPE2_FOUND" = xno; then | 31547 if test "x$FREETYPE2_FOUND" = xno; then |
| 31539 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for freetype in some standard locations" >&5 | 31548 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for freetype in some standard locations" >&5 |
| 31540 $as_echo_n "checking for freetype in some standard locations... " >&6; } | 31549 $as_echo_n "checking for freetype in some standard locations... " >&6; } |
| 31541 | 31550 |
| 31542 if test -s /usr/X11/include/ft2build.h && test -d /usr/X11/include/freetype2/freetype; then | 31551 if test -s $SYS_ROOT/usr/X11/include/ft2build.h && test -d $SYS_ROOT/usr/X11/include/freetype2/freetype; then |
| 31543 DEFAULT_FREETYPE_CFLAGS="-I/usr/X11/include/freetype2 -I/usr/X11/include" | 31552 DEFAULT_FREETYPE_CFLAGS="-I$SYS_ROOT/usr/X11/include/freetype2 -I$SYS_ROOT/usr/X11/include" |
| 31544 DEFAULT_FREETYPE_LIBS="-L/usr/X11/lib -lfreetype" | 31553 DEFAULT_FREETYPE_LIBS="-L$SYS_ROOT/usr/X11/lib -lfreetype" |
| 31545 fi | 31554 fi |
| 31546 if test -s /usr/include/ft2build.h && test -d /usr/include/freetype2/freetype; then | 31555 if test -s $SYS_ROOT/usr/include/ft2build.h && test -d $SYS_ROOT/usr/include/freetype2/freetype; then |
| 31547 DEFAULT_FREETYPE_CFLAGS="-I/usr/include/freetype2" | 31556 DEFAULT_FREETYPE_CFLAGS="-I$SYS_ROOT/usr/include/freetype2" |
| 31548 DEFAULT_FREETYPE_LIBS="-lfreetype" | 31557 DEFAULT_FREETYPE_LIBS="-lfreetype" |
| 31549 fi | 31558 fi |
| 31550 | 31559 |
| 31551 PREV_CXXCFLAGS="$CXXFLAGS" | 31560 PREV_CXXCFLAGS="$CXXFLAGS" |
| 31552 PREV_LDFLAGS="$LDFLAGS" | 31561 PREV_LDFLAGS="$LDFLAGS" |
| 33218 else | 33227 else |
| 33219 ENABLE_CCACHE=yes | 33228 ENABLE_CCACHE=yes |
| 33220 fi | 33229 fi |
| 33221 | 33230 |
| 33222 if test "x$ENABLE_CCACHE" = xyes; then | 33231 if test "x$ENABLE_CCACHE" = xyes; then |
| 33232 OLD_PATH="$PATH" | |
| 33233 if test "x$TOOLS_DIR" != x; then | |
| 33234 PATH=$TOOLS_DIR:$PATH | |
| 33235 fi | |
| 33223 # Extract the first word of "ccache", so it can be a program name with args. | 33236 # Extract the first word of "ccache", so it can be a program name with args. |
| 33224 set dummy ccache; ac_word=$2 | 33237 set dummy ccache; ac_word=$2 |
| 33225 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | 33238 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| 33226 $as_echo_n "checking for $ac_word... " >&6; } | 33239 $as_echo_n "checking for $ac_word... " >&6; } |
| 33227 if test "${ac_cv_path_CCACHE+set}" = set; then : | 33240 if test "${ac_cv_path_CCACHE+set}" = set; then : |
| 33258 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | 33271 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
| 33259 $as_echo "no" >&6; } | 33272 $as_echo "no" >&6; } |
| 33260 fi | 33273 fi |
| 33261 | 33274 |
| 33262 | 33275 |
| 33276 PATH="$OLD_PATH" | |
| 33263 else | 33277 else |
| 33264 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ccache" >&5 | 33278 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ccache" >&5 |
| 33265 $as_echo_n "checking for ccache... " >&6; } | 33279 $as_echo_n "checking for ccache... " >&6; } |
| 33266 { $as_echo "$as_me:${as_lineno-$LINENO}: result: explicitly disabled" >&5 | 33280 { $as_echo "$as_me:${as_lineno-$LINENO}: result: explicitly disabled" >&5 |
| 33267 $as_echo "explicitly disabled" >&6; } | 33281 $as_echo "explicitly disabled" >&6; } |
