4585 # definitions. It is replaced with custom functionality when building |
4585 # definitions. It is replaced with custom functionality when building |
4586 # custom sources. |
4586 # custom sources. |
4587 #CUSTOM_AUTOCONF_INCLUDE |
4587 #CUSTOM_AUTOCONF_INCLUDE |
4588 |
4588 |
4589 # Do not change or remove the following line, it is needed for consistency checks: |
4589 # Do not change or remove the following line, it is needed for consistency checks: |
4590 DATE_WHEN_GENERATED=1444224363 |
4590 DATE_WHEN_GENERATED=1444643341 |
4591 |
4591 |
4592 ############################################################################### |
4592 ############################################################################### |
4593 # |
4593 # |
4594 # Initialization / Boot-strapping |
4594 # Initialization / Boot-strapping |
4595 # |
4595 # |
46676 $as_echo "$as_me: WARNING: X11 is not used, so --with-x is ignored" >&2;} |
46676 $as_echo "$as_me: WARNING: X11 is not used, so --with-x is ignored" >&2;} |
46677 fi |
46677 fi |
46678 X_CFLAGS= |
46678 X_CFLAGS= |
46679 X_LIBS= |
46679 X_LIBS= |
46680 else |
46680 else |
46681 # Check if the user has specified sysroot, but not --x-includes or --x-libraries. |
46681 |
46682 # Make a simple check for the libraries at the sysroot, and setup --x-includes and |
46682 if test "x${with_x}" = xno; then |
46683 # --x-libraries for the sysroot, if that seems to be correct. |
46683 as_fn_error $? "It is not possible to disable the use of X11. Remove the --without-x option." "$LINENO" 5 |
46684 if test "x$OPENJDK_TARGET_OS" = "xlinux"; then |
46684 fi |
|
46685 |
|
46686 if test "x${with_x}" != x && test "x${with_x}" != xyes; then |
|
46687 # The user has specified a X11 base directory. Use it for includes and |
|
46688 # libraries, unless explicitely overridden. |
|
46689 if test "x$x_includes" = xNONE; then |
|
46690 x_includes="${with_x}/include" |
|
46691 fi |
|
46692 if test "x$x_libraries" = xNONE; then |
|
46693 x_libraries="${with_x}/lib" |
|
46694 fi |
|
46695 else |
|
46696 # Check if the user has specified sysroot, but not --with-x, --x-includes or --x-libraries. |
|
46697 # Make a simple check for the libraries at the sysroot, and setup --x-includes and |
|
46698 # --x-libraries for the sysroot, if that seems to be correct. |
46685 if test "x$SYSROOT" != "x"; then |
46699 if test "x$SYSROOT" != "x"; then |
46686 if test "x$x_includes" = xNONE; then |
46700 if test "x$x_includes" = xNONE; then |
46687 if test -f "$SYSROOT/usr/X11R6/include/X11/Xlib.h"; then |
46701 if test -f "$SYSROOT/usr/X11R6/include/X11/Xlib.h"; then |
46688 x_includes="$SYSROOT/usr/X11R6/include" |
46702 x_includes="$SYSROOT/usr/X11R6/include" |
46689 elif test -f "$SYSROOT/usr/include/X11/Xlib.h"; then |
46703 elif test -f "$SYSROOT/usr/include/X11/Xlib.h"; then |