84 fi
85
86 if test "x$no_x" = xyes; then
87 HELP_MSG_MISSING_DEPENDENCY([x11])
88 AC_MSG_ERROR([Could not find X11 libraries. $HELP_MSG])
89 fi
90
91 if test "x$OPENJDK_TARGET_OS" = xsolaris; then
92 OPENWIN_HOME="/usr/openwin"
93 X_CFLAGS="-I$SYSROOT$OPENWIN_HOME/include -I$SYSROOT$OPENWIN_HOME/include/X11/extensions"
94 X_LIBS="-L$SYSROOT$OPENWIN_HOME/lib$OPENJDK_TARGET_CPU_ISADIR \
95 -R$OPENWIN_HOME/lib$OPENJDK_TARGET_CPU_ISADIR"
96 fi
97
98 AC_LANG_PUSH(C)
99 OLD_CFLAGS="$CFLAGS"
100 CFLAGS="$CFLAGS $SYSROOT_CFLAGS $X_CFLAGS"
101
102 HEADERS_TO_CHECK="X11/extensions/shape.h X11/extensions/Xrender.h X11/extensions/XTest.h X11/Intrinsic.h"
103 # There is no Xrandr extension on AIX
104 if test "x$OPENJDK_TARGET_OS" != xaix; then
105 HEADERS_TO_CHECK="$HEADERS_TO_CHECK X11/extensions/Xrandr.h"
106 fi
107
108 # Need to include Xlib.h and Xutil.h to avoid "present but cannot be compiled" warnings on Solaris 10
109 AC_CHECK_HEADERS([$HEADERS_TO_CHECK],
110 [X11_HEADERS_OK=yes],
111 [X11_HEADERS_OK=no; break],
112 [
113 # include <X11/Xlib.h>
114 # include <X11/Xutil.h>
115 ]
116 )
117
118 if test "x$X11_HEADERS_OK" = xno; then
119 HELP_MSG_MISSING_DEPENDENCY([x11])
120 AC_MSG_ERROR([Could not find all X11 headers (shape.h Xrender.h Xrander.h XTest.h Intrinsic.h). $HELP_MSG])
121 fi
122
123 # If XLinearGradient isn't available in Xrender.h, signal that it needs to be
124 # defined in libawt_xawt.
|
84 fi
85
86 if test "x$no_x" = xyes; then
87 HELP_MSG_MISSING_DEPENDENCY([x11])
88 AC_MSG_ERROR([Could not find X11 libraries. $HELP_MSG])
89 fi
90
91 if test "x$OPENJDK_TARGET_OS" = xsolaris; then
92 OPENWIN_HOME="/usr/openwin"
93 X_CFLAGS="-I$SYSROOT$OPENWIN_HOME/include -I$SYSROOT$OPENWIN_HOME/include/X11/extensions"
94 X_LIBS="-L$SYSROOT$OPENWIN_HOME/lib$OPENJDK_TARGET_CPU_ISADIR \
95 -R$OPENWIN_HOME/lib$OPENJDK_TARGET_CPU_ISADIR"
96 fi
97
98 AC_LANG_PUSH(C)
99 OLD_CFLAGS="$CFLAGS"
100 CFLAGS="$CFLAGS $SYSROOT_CFLAGS $X_CFLAGS"
101
102 HEADERS_TO_CHECK="X11/extensions/shape.h X11/extensions/Xrender.h X11/extensions/XTest.h X11/Intrinsic.h"
103 # There is no Xrandr extension on AIX
104 if test "x$OPENJDK_TARGET_OS" = xaix; then
105 X_CFLAGS="$X_CFLAGS -DNO_XRANDR"
106 else
107 HEADERS_TO_CHECK="$HEADERS_TO_CHECK X11/extensions/Xrandr.h"
108 fi
109
110 # Need to include Xlib.h and Xutil.h to avoid "present but cannot be compiled" warnings on Solaris 10
111 AC_CHECK_HEADERS([$HEADERS_TO_CHECK],
112 [X11_HEADERS_OK=yes],
113 [X11_HEADERS_OK=no; break],
114 [
115 # include <X11/Xlib.h>
116 # include <X11/Xutil.h>
117 ]
118 )
119
120 if test "x$X11_HEADERS_OK" = xno; then
121 HELP_MSG_MISSING_DEPENDENCY([x11])
122 AC_MSG_ERROR([Could not find all X11 headers (shape.h Xrender.h Xrander.h XTest.h Intrinsic.h). $HELP_MSG])
123 fi
124
125 # If XLinearGradient isn't available in Xrender.h, signal that it needs to be
126 # defined in libawt_xawt.
|