32 lines
1.5 KiB
Diff
32 lines
1.5 KiB
Diff
|
--- openjdk/common/autoconf/help.m4 2016-02-29 17:10:45.542747800 +0100
|
||
|
|
+++ openjdk/common/autoconf/help.m4 2016-02-29 17:10:45.500748539 +0100
|
||
|
|
@@ -112,7 +112,7 @@
|
||
|
|
pulse)
|
||
|
|
PKGHANDLER_COMMAND="sudo apt-get install libpulse-dev" ;;
|
||
|
|
x11)
|
||
|
|
- PKGHANDLER_COMMAND="sudo apt-get install libX11-dev libxext-dev libxrender-dev libxtst-dev libxt-dev" ;;
|
||
|
|
+ PKGHANDLER_COMMAND="sudo apt-get install libX11-dev libxext-dev libxrender-dev libxtst-dev libxt-dev libXcomposite-dev" ;;
|
||
|
|
ccache)
|
||
|
|
PKGHANDLER_COMMAND="sudo apt-get install ccache" ;;
|
||
|
|
esac
|
||
|
|
--- openjdk/common/autoconf/libraries.m4 2016-02-29 17:10:45.716744742 +0100
|
||
|
|
+++ openjdk/common/autoconf/libraries.m4 2016-02-29 17:10:45.675745462 +0100
|
||
|
|
@@ -153,7 +153,7 @@
|
||
|
|
CFLAGS="$CFLAGS $X_CFLAGS"
|
||
|
|
|
||
|
|
# Need to include Xlib.h and Xutil.h to avoid "present but cannot be compiled" warnings on Solaris 10
|
||
|
|
- AC_CHECK_HEADERS([X11/extensions/shape.h X11/extensions/Xrender.h X11/extensions/XTest.h X11/Intrinsic.h],
|
||
|
|
+ AC_CHECK_HEADERS([X11/extensions/shape.h X11/extensions/Xrender.h X11/extensions/XTest.h X11/Intrinsic.h X11/extensions/Xcomposite.h],
|
||
|
|
[X11_A_OK=yes],
|
||
|
|
[X11_A_OK=no; break],
|
||
|
|
[
|
||
|
|
@@ -167,7 +167,7 @@
|
||
|
|
|
||
|
|
if test "x$X11_A_OK" = xno && test "x$X11_NOT_NEEDED" != xyes; then
|
||
|
|
HELP_MSG_MISSING_DEPENDENCY([x11])
|
||
|
|
- AC_MSG_ERROR([Could not find all X11 headers (shape.h Xrender.h XTest.h Intrinsic.h). $HELP_MSG])
|
||
|
|
+ AC_MSG_ERROR([Could not find all X11 headers (shape.h Xrender.h XTest.h Intrinsic.h Xcomposite.h). $HELP_MSG])
|
||
|
|
fi
|
||
|
|
|
||
|
|
AC_SUBST(X_CFLAGS)
|