71 fi
72 fi
73 fi
74 fi
75
76 # Now let autoconf do it's magic
77 AC_PATH_X
78 AC_PATH_XTRA
79
80 # AC_PATH_XTRA creates X_LIBS and sometimes adds -R flags. When cross compiling
81 # this doesn't make sense so we remove it.
82 if test "x$COMPILE_TYPE" = xcross; then
83 X_LIBS=`$ECHO $X_LIBS | $SED 's/-R \{0,1\}[[^ ]]*//g'`
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 Xrandr.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.
127 AC_MSG_CHECKING([if XlinearGradient is defined in Xrender.h])
128 AC_COMPILE_IFELSE(
129 [AC_LANG_PROGRAM([[#include <X11/extensions/Xrender.h>]],
130 [[XLinearGradient x;]])],
131 [AC_MSG_RESULT([yes])],
132 [AC_MSG_RESULT([no])
133 X_CFLAGS="$X_CFLAGS -DSOLARIS10_NO_XRENDER_STRUCTS"])
134
135 CFLAGS="$OLD_CFLAGS"
136 AC_LANG_POP(C)
137 fi # NEEDS_LIB_X11
138
139 AC_SUBST(X_CFLAGS)
140 AC_SUBST(X_LIBS)
141 ])
|
71 fi
72 fi
73 fi
74 fi
75
76 # Now let autoconf do it's magic
77 AC_PATH_X
78 AC_PATH_XTRA
79
80 # AC_PATH_XTRA creates X_LIBS and sometimes adds -R flags. When cross compiling
81 # this doesn't make sense so we remove it.
82 if test "x$COMPILE_TYPE" = xcross; then
83 X_LIBS=`$ECHO $X_LIBS | $SED 's/-R \{0,1\}[[^ ]]*//g'`
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 AC_LANG_PUSH(C)
92 OLD_CFLAGS="$CFLAGS"
93 CFLAGS="$CFLAGS $SYSROOT_CFLAGS $X_CFLAGS"
94
95 HEADERS_TO_CHECK="X11/extensions/shape.h X11/extensions/Xrender.h X11/extensions/XTest.h X11/Intrinsic.h"
96 # There is no Xrandr extension on AIX
97 if test "x$OPENJDK_TARGET_OS" = xaix; then
98 X_CFLAGS="$X_CFLAGS -DNO_XRANDR"
99 else
100 HEADERS_TO_CHECK="$HEADERS_TO_CHECK X11/extensions/Xrandr.h"
101 fi
102
103 # Need to include Xlib.h and Xutil.h to avoid "present but cannot be compiled" warnings on Solaris 10
104 AC_CHECK_HEADERS([$HEADERS_TO_CHECK],
105 [X11_HEADERS_OK=yes],
106 [X11_HEADERS_OK=no; break],
107 [
108 # include <X11/Xlib.h>
109 # include <X11/Xutil.h>
110 ]
111 )
112
113 if test "x$X11_HEADERS_OK" = xno; then
114 HELP_MSG_MISSING_DEPENDENCY([x11])
115 AC_MSG_ERROR([Could not find all X11 headers (shape.h Xrender.h Xrandr.h XTest.h Intrinsic.h). $HELP_MSG])
116 fi
117
118 CFLAGS="$OLD_CFLAGS"
119 AC_LANG_POP(C)
120 fi # NEEDS_LIB_X11
121
122 AC_SUBST(X_CFLAGS)
123 AC_SUBST(X_LIBS)
124 ])
|