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/sfw/lib$OPENJDK_TARGET_CPU_ISADIR \
95 -L$SYSROOT$OPENWIN_HOME/lib$OPENJDK_TARGET_CPU_ISADIR \
96 -R$OPENWIN_HOME/sfw/lib$OPENJDK_TARGET_CPU_ISADIR \
97 -R$OPENWIN_HOME/lib$OPENJDK_TARGET_CPU_ISADIR"
98 fi
99
100 AC_LANG_PUSH(C)
101 OLD_CFLAGS="$CFLAGS"
102 CFLAGS="$CFLAGS $SYSROOT_CFLAGS $X_CFLAGS"
103
104 # Need to include Xlib.h and Xutil.h to avoid "present but cannot be compiled" warnings on Solaris 10
105 AC_CHECK_HEADERS([X11/extensions/shape.h X11/extensions/Xrender.h X11/extensions/XTest.h X11/Intrinsic.h],
106 [X11_HEADERS_OK=yes],
107 [X11_HEADERS_OK=no; break],
108 [
109 # include <X11/Xlib.h>
110 # include <X11/Xutil.h>
111 ]
112 )
113
114 if test "x$X11_HEADERS_OK" = xno; then
115 HELP_MSG_MISSING_DEPENDENCY([x11])
116 AC_MSG_ERROR([Could not find all X11 headers (shape.h Xrender.h XTest.h Intrinsic.h). $HELP_MSG])
|
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 # Need to include Xlib.h and Xutil.h to avoid "present but cannot be compiled" warnings on Solaris 10
103 AC_CHECK_HEADERS([X11/extensions/shape.h X11/extensions/Xrender.h X11/extensions/XTest.h X11/Intrinsic.h],
104 [X11_HEADERS_OK=yes],
105 [X11_HEADERS_OK=no; break],
106 [
107 # include <X11/Xlib.h>
108 # include <X11/Xutil.h>
109 ]
110 )
111
112 if test "x$X11_HEADERS_OK" = xno; then
113 HELP_MSG_MISSING_DEPENDENCY([x11])
114 AC_MSG_ERROR([Could not find all X11 headers (shape.h Xrender.h XTest.h Intrinsic.h). $HELP_MSG])
|