134
135 # Now let autoconf do it's magic
136 AC_PATH_X
137 AC_PATH_XTRA
138
139 # AC_PATH_XTRA creates X_LIBS and sometimes adds -R flags. When cross compiling
140 # this doesn't make sense so we remove it.
141 if test "x$COMPILE_TYPE" = xcross; then
142 X_LIBS=`$ECHO $X_LIBS | $SED 's/-R \{0,1\}[[^ ]]*//g'`
143 fi
144
145 if test "x$no_x" = xyes && test "x$X11_NOT_NEEDED" != xyes; then
146 HELP_MSG_MISSING_DEPENDENCY([x11])
147 AC_MSG_ERROR([Could not find X11 libraries. $HELP_MSG])
148 fi
149
150 # Some of the old makefiles require a setting of OPENWIN_HOME
151 # Since the X11R6 directory has disappeared on later Linuxes,
152 # we need to probe for it.
153 if test "x$OPENJDK_TARGET_OS" = xlinux; then
154 if test -d "$SYS_ROOT/usr/X11R6"; then
155 OPENWIN_HOME="$SYS_ROOT/usr/X11R6"
156 fi
157 if test -d "$SYS_ROOT/usr/include/X11"; then
158 OPENWIN_HOME="$SYS_ROOT/usr"
159 fi
160 fi
161 if test "x$OPENJDK_TARGET_OS" = xsolaris; then
162 OPENWIN_HOME="/usr/openwin"
163 fi
164 AC_SUBST(OPENWIN_HOME)
165
166
167 #
168 # Weird Sol10 something check...TODO change to try compile
169 #
170 if test "x${OPENJDK_TARGET_OS}" = xsolaris; then
171 if test "`uname -r`" = "5.10"; then
172 if test "`${EGREP} -c XLinearGradient ${OPENWIN_HOME}/share/include/X11/extensions/Xrender.h`" = "0"; then
173 X_CFLAGS="${X_CFLAGS} -DSOLARIS10_NO_XRENDER_STRUCTS"
174 fi
175 fi
176 fi
177
178 AC_LANG_PUSH(C)
|
134
135 # Now let autoconf do it's magic
136 AC_PATH_X
137 AC_PATH_XTRA
138
139 # AC_PATH_XTRA creates X_LIBS and sometimes adds -R flags. When cross compiling
140 # this doesn't make sense so we remove it.
141 if test "x$COMPILE_TYPE" = xcross; then
142 X_LIBS=`$ECHO $X_LIBS | $SED 's/-R \{0,1\}[[^ ]]*//g'`
143 fi
144
145 if test "x$no_x" = xyes && test "x$X11_NOT_NEEDED" != xyes; then
146 HELP_MSG_MISSING_DEPENDENCY([x11])
147 AC_MSG_ERROR([Could not find X11 libraries. $HELP_MSG])
148 fi
149
150 # Some of the old makefiles require a setting of OPENWIN_HOME
151 # Since the X11R6 directory has disappeared on later Linuxes,
152 # we need to probe for it.
153 if test "x$OPENJDK_TARGET_OS" = xlinux; then
154 if test -d "$SYS_ROOT/usr/include/X11"; then
155 OPENWIN_HOME="$SYS_ROOT/usr"
156 fi
157 # Older Linuxes (e.g. SLES 10) may still have the X11R6 directory but also
158 # a symlink from /usr/include/X11 to ../X11R6/include/X11 so we need to
159 # check for the X11R6 directory AFTER we checked for /usr/include/X11
160 if test -d "$SYS_ROOT/usr/X11R6"; then
161 OPENWIN_HOME="$SYS_ROOT/usr/X11R6"
162 fi
163 fi
164 if test "x$OPENJDK_TARGET_OS" = xsolaris; then
165 OPENWIN_HOME="/usr/openwin"
166 fi
167 AC_SUBST(OPENWIN_HOME)
168
169
170 #
171 # Weird Sol10 something check...TODO change to try compile
172 #
173 if test "x${OPENJDK_TARGET_OS}" = xsolaris; then
174 if test "`uname -r`" = "5.10"; then
175 if test "`${EGREP} -c XLinearGradient ${OPENWIN_HOME}/share/include/X11/extensions/Xrender.h`" = "0"; then
176 X_CFLAGS="${X_CFLAGS} -DSOLARIS10_NO_XRENDER_STRUCTS"
177 fi
178 fi
179 fi
180
181 AC_LANG_PUSH(C)
|