1.1 --- a/common/autoconf/generated-configure.sh Tue Jun 18 11:29:34 2013 +0200
1.2 +++ b/common/autoconf/generated-configure.sh Tue Jun 18 11:30:36 2013 +0200
1.3 @@ -3782,7 +3782,7 @@
1.4 #CUSTOM_AUTOCONF_INCLUDE
1.5
1.6 # Do not change or remove the following line, it is needed for consistency checks:
1.7 -DATE_WHEN_GENERATED=1371547755
1.8 +DATE_WHEN_GENERATED=1371547824
1.9
1.10 ###############################################################################
1.11 #
1.12 @@ -7471,7 +7471,11 @@
1.13 as_fn_error $? "Cannot specify both --with-devkit and --with-tools-dir at the same time" "$LINENO" 5
1.14 fi
1.15 TOOLS_DIR=$with_devkit/bin
1.16 - SYS_ROOT=$with_devkit/$host_alias/libc
1.17 + if test -d "$with_devkit/$host_alias/libc"; then
1.18 + SYS_ROOT=$with_devkit/$host_alias/libc
1.19 + elif test -d "$with_devkit/$host/sys-root"; then
1.20 + SYS_ROOT=$with_devkit/$host/sys-root
1.21 + fi
1.22
1.23 fi
1.24
1.25 @@ -29910,11 +29914,17 @@
1.26 if test "x$x_includes" = xNONE; then
1.27 if test -f "$SYS_ROOT/usr/X11R6/include/X11/Xlib.h"; then
1.28 x_includes="$SYS_ROOT/usr/X11R6/include"
1.29 + elif test -f "$SYS_ROOT/usr/include/X11/Xlib.h"; then
1.30 + x_includes="$SYS_ROOT/usr/include"
1.31 fi
1.32 fi
1.33 if test "x$x_libraries" = xNONE; then
1.34 if test -f "$SYS_ROOT/usr/X11R6/lib/libX11.so"; then
1.35 x_libraries="$SYS_ROOT/usr/X11R6/lib"
1.36 + elif test "$SYS_ROOT/usr/lib64/libX11.so" && test "x$OPENJDK_TARGET_CPU_BITS" = x64; then
1.37 + x_libraries="$SYS_ROOT/usr/lib64"
1.38 + elif test -f "$SYS_ROOT/usr/lib/libX11.so"; then
1.39 + x_libraries="$SYS_ROOT/usr/lib"
1.40 fi
1.41 fi
1.42 fi
1.43 @@ -30645,8 +30655,7 @@
1.44 if test "x$OPENJDK_TARGET_OS" = xlinux; then
1.45 if test -d "$SYS_ROOT/usr/X11R6"; then
1.46 OPENWIN_HOME="$SYS_ROOT/usr/X11R6"
1.47 - fi
1.48 - if test -d "$SYS_ROOT/usr/include/X11"; then
1.49 + elif test -d "$SYS_ROOT/usr/include/X11"; then
1.50 OPENWIN_HOME="$SYS_ROOT/usr"
1.51 fi
1.52 fi
1.53 @@ -31539,12 +31548,12 @@
1.54 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for freetype in some standard locations" >&5
1.55 $as_echo_n "checking for freetype in some standard locations... " >&6; }
1.56
1.57 - if test -s /usr/X11/include/ft2build.h && test -d /usr/X11/include/freetype2/freetype; then
1.58 - DEFAULT_FREETYPE_CFLAGS="-I/usr/X11/include/freetype2 -I/usr/X11/include"
1.59 - DEFAULT_FREETYPE_LIBS="-L/usr/X11/lib -lfreetype"
1.60 + if test -s $SYS_ROOT/usr/X11/include/ft2build.h && test -d $SYS_ROOT/usr/X11/include/freetype2/freetype; then
1.61 + DEFAULT_FREETYPE_CFLAGS="-I$SYS_ROOT/usr/X11/include/freetype2 -I$SYS_ROOT/usr/X11/include"
1.62 + DEFAULT_FREETYPE_LIBS="-L$SYS_ROOT/usr/X11/lib -lfreetype"
1.63 fi
1.64 - if test -s /usr/include/ft2build.h && test -d /usr/include/freetype2/freetype; then
1.65 - DEFAULT_FREETYPE_CFLAGS="-I/usr/include/freetype2"
1.66 + if test -s $SYS_ROOT/usr/include/ft2build.h && test -d $SYS_ROOT/usr/include/freetype2/freetype; then
1.67 + DEFAULT_FREETYPE_CFLAGS="-I$SYS_ROOT/usr/include/freetype2"
1.68 DEFAULT_FREETYPE_LIBS="-lfreetype"
1.69 fi
1.70
1.71 @@ -33220,6 +33229,10 @@
1.72 fi
1.73
1.74 if test "x$ENABLE_CCACHE" = xyes; then
1.75 + OLD_PATH="$PATH"
1.76 + if test "x$TOOLS_DIR" != x; then
1.77 + PATH=$TOOLS_DIR:$PATH
1.78 + fi
1.79 # Extract the first word of "ccache", so it can be a program name with args.
1.80 set dummy ccache; ac_word=$2
1.81 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.82 @@ -33260,6 +33273,7 @@
1.83 fi
1.84
1.85
1.86 + PATH="$OLD_PATH"
1.87 else
1.88 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ccache" >&5
1.89 $as_echo_n "checking for ccache... " >&6; }
