8062661: Do not perform X11 checks in configure when X11 is not needed
Reviewed-by: tbell
This commit is contained in:
Magnus Ihse Bursie
parent
f2253115a2
commit
9b6713919a
@ -3944,7 +3944,7 @@ yum_help() {
|
|||||||
pulse)
|
pulse)
|
||||||
PKGHANDLER_COMMAND="sudo yum install pulseaudio-libs-devel" ;;
|
PKGHANDLER_COMMAND="sudo yum install pulseaudio-libs-devel" ;;
|
||||||
x11)
|
x11)
|
||||||
PKGHANDLER_COMMAND="sudo yum install libXtst-devel libXt-devel libXrender-devel" ;;
|
PKGHANDLER_COMMAND="sudo yum install libXtst-devel libXt-devel libXrender-devel libXi-devel" ;;
|
||||||
ccache)
|
ccache)
|
||||||
PKGHANDLER_COMMAND="sudo yum install ccache" ;;
|
PKGHANDLER_COMMAND="sudo yum install ccache" ;;
|
||||||
esac
|
esac
|
||||||
@ -4328,7 +4328,7 @@ TOOLCHAIN_DESCRIPTION_xlc="IBM XL C/C++"
|
|||||||
#CUSTOM_AUTOCONF_INCLUDE
|
#CUSTOM_AUTOCONF_INCLUDE
|
||||||
|
|
||||||
# Do not change or remove the following line, it is needed for consistency checks:
|
# Do not change or remove the following line, it is needed for consistency checks:
|
||||||
DATE_WHEN_GENERATED=1415177189
|
DATE_WHEN_GENERATED=1415177972
|
||||||
|
|
||||||
###############################################################################
|
###############################################################################
|
||||||
#
|
#
|
||||||
@ -43273,32 +43273,40 @@ $as_echo "alsa" >&6; }
|
|||||||
# Check for X Windows
|
# Check for X Windows
|
||||||
#
|
#
|
||||||
|
|
||||||
# Check if the user has specified sysroot, but not --x-includes or --x-libraries.
|
if test "x$X11_NOT_NEEDED" = xyes; then
|
||||||
# Make a simple check for the libraries at the sysroot, and setup --x-includes and
|
if test "x${with_x}" != x; then
|
||||||
# --x-libraries for the sysroot, if that seems to be correct.
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: X11 is not used, so --with-x is ignored" >&5
|
||||||
if test "x$OPENJDK_TARGET_OS" = "xlinux"; then
|
$as_echo "$as_me: WARNING: X11 is not used, so --with-x is ignored" >&2;}
|
||||||
if test "x$SYSROOT" != "x"; then
|
fi
|
||||||
if test "x$x_includes" = xNONE; then
|
X_CFLAGS=
|
||||||
if test -f "$SYSROOT/usr/X11R6/include/X11/Xlib.h"; then
|
X_LIBS=
|
||||||
x_includes="$SYSROOT/usr/X11R6/include"
|
else
|
||||||
elif test -f "$SYSROOT/usr/include/X11/Xlib.h"; then
|
# Check if the user has specified sysroot, but not --x-includes or --x-libraries.
|
||||||
x_includes="$SYSROOT/usr/include"
|
# Make a simple check for the libraries at the sysroot, and setup --x-includes and
|
||||||
|
# --x-libraries for the sysroot, if that seems to be correct.
|
||||||
|
if test "x$OPENJDK_TARGET_OS" = "xlinux"; then
|
||||||
|
if test "x$SYSROOT" != "x"; then
|
||||||
|
if test "x$x_includes" = xNONE; then
|
||||||
|
if test -f "$SYSROOT/usr/X11R6/include/X11/Xlib.h"; then
|
||||||
|
x_includes="$SYSROOT/usr/X11R6/include"
|
||||||
|
elif test -f "$SYSROOT/usr/include/X11/Xlib.h"; then
|
||||||
|
x_includes="$SYSROOT/usr/include"
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
fi
|
if test "x$x_libraries" = xNONE; then
|
||||||
if test "x$x_libraries" = xNONE; then
|
if test -f "$SYSROOT/usr/X11R6/lib/libX11.so"; then
|
||||||
if test -f "$SYSROOT/usr/X11R6/lib/libX11.so"; then
|
x_libraries="$SYSROOT/usr/X11R6/lib"
|
||||||
x_libraries="$SYSROOT/usr/X11R6/lib"
|
elif test "$SYSROOT/usr/lib64/libX11.so" && test "x$OPENJDK_TARGET_CPU_BITS" = x64; then
|
||||||
elif test "$SYSROOT/usr/lib64/libX11.so" && test "x$OPENJDK_TARGET_CPU_BITS" = x64; then
|
x_libraries="$SYSROOT/usr/lib64"
|
||||||
x_libraries="$SYSROOT/usr/lib64"
|
elif test -f "$SYSROOT/usr/lib/libX11.so"; then
|
||||||
elif test -f "$SYSROOT/usr/lib/libX11.so"; then
|
x_libraries="$SYSROOT/usr/lib"
|
||||||
x_libraries="$SYSROOT/usr/lib"
|
fi
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
fi
|
|
||||||
|
|
||||||
# Now let autoconf do it's magic
|
# Now let autoconf do it's magic
|
||||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for X" >&5
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for X" >&5
|
||||||
$as_echo_n "checking for X... " >&6; }
|
$as_echo_n "checking for X... " >&6; }
|
||||||
|
|
||||||
|
|
||||||
@ -43491,7 +43499,7 @@ else
|
|||||||
$as_echo "libraries $x_libraries, headers $x_includes" >&6; }
|
$as_echo "libraries $x_libraries, headers $x_includes" >&6; }
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if test "$no_x" = yes; then
|
if test "$no_x" = yes; then
|
||||||
# Not all programs may use this symbol, but it does not hurt to define it.
|
# Not all programs may use this symbol, but it does not hurt to define it.
|
||||||
|
|
||||||
$as_echo "#define X_DISPLAY_MISSING 1" >>confdefs.h
|
$as_echo "#define X_DISPLAY_MISSING 1" >>confdefs.h
|
||||||
@ -43982,13 +43990,13 @@ fi
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
# AC_PATH_XTRA creates X_LIBS and sometimes adds -R flags. When cross compiling
|
# AC_PATH_XTRA creates X_LIBS and sometimes adds -R flags. When cross compiling
|
||||||
# this doesn't make sense so we remove it.
|
# this doesn't make sense so we remove it.
|
||||||
if test "x$COMPILE_TYPE" = xcross; then
|
if test "x$COMPILE_TYPE" = xcross; then
|
||||||
X_LIBS=`$ECHO $X_LIBS | $SED 's/-R \{0,1\}[^ ]*//g'`
|
X_LIBS=`$ECHO $X_LIBS | $SED 's/-R \{0,1\}[^ ]*//g'`
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if test "x$no_x" = xyes && test "x$X11_NOT_NEEDED" != xyes; then
|
if test "x$no_x" = xyes; then
|
||||||
|
|
||||||
# Print a helpful message on how to acquire the necessary build dependency.
|
# Print a helpful message on how to acquire the necessary build dependency.
|
||||||
# x11 is the help tag: freetype, cups, pulse, alsa etc
|
# x11 is the help tag: freetype, cups, pulse, alsa etc
|
||||||
@ -44019,34 +44027,34 @@ fi
|
|||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
as_fn_error $? "Could not find X11 libraries. $HELP_MSG" "$LINENO" 5
|
as_fn_error $? "Could not find X11 libraries. $HELP_MSG" "$LINENO" 5
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if test "x$OPENJDK_TARGET_OS" = xsolaris; then
|
if test "x$OPENJDK_TARGET_OS" = xsolaris; then
|
||||||
OPENWIN_HOME="/usr/openwin"
|
OPENWIN_HOME="/usr/openwin"
|
||||||
X_CFLAGS="-I$SYSROOT$OPENWIN_HOME/include -I$SYSROOT$OPENWIN_HOME/include/X11/extensions"
|
X_CFLAGS="-I$SYSROOT$OPENWIN_HOME/include -I$SYSROOT$OPENWIN_HOME/include/X11/extensions"
|
||||||
X_LIBS="-L$SYSROOT$OPENWIN_HOME/sfw/lib$OPENJDK_TARGET_CPU_ISADIR \
|
X_LIBS="-L$SYSROOT$OPENWIN_HOME/sfw/lib$OPENJDK_TARGET_CPU_ISADIR \
|
||||||
-L$SYSROOT$OPENWIN_HOME/lib$OPENJDK_TARGET_CPU_ISADIR \
|
-L$SYSROOT$OPENWIN_HOME/lib$OPENJDK_TARGET_CPU_ISADIR \
|
||||||
-R$OPENWIN_HOME/sfw/lib$OPENJDK_TARGET_CPU_ISADIR \
|
-R$OPENWIN_HOME/sfw/lib$OPENJDK_TARGET_CPU_ISADIR \
|
||||||
-R$OPENWIN_HOME/lib$OPENJDK_TARGET_CPU_ISADIR"
|
-R$OPENWIN_HOME/lib$OPENJDK_TARGET_CPU_ISADIR"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
ac_ext=c
|
ac_ext=c
|
||||||
ac_cpp='$CPP $CPPFLAGS'
|
ac_cpp='$CPP $CPPFLAGS'
|
||||||
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
|
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
|
||||||
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
|
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
|
||||||
ac_compiler_gnu=$ac_cv_c_compiler_gnu
|
ac_compiler_gnu=$ac_cv_c_compiler_gnu
|
||||||
|
|
||||||
OLD_CFLAGS="$CFLAGS"
|
OLD_CFLAGS="$CFLAGS"
|
||||||
CFLAGS="$CFLAGS $SYSROOT_CFLAGS $X_CFLAGS"
|
CFLAGS="$CFLAGS $SYSROOT_CFLAGS $X_CFLAGS"
|
||||||
|
|
||||||
# Need to include Xlib.h and Xutil.h to avoid "present but cannot be compiled" warnings on Solaris 10
|
# Need to include Xlib.h and Xutil.h to avoid "present but cannot be compiled" warnings on Solaris 10
|
||||||
for ac_header in X11/extensions/shape.h X11/extensions/Xrender.h X11/extensions/XTest.h X11/Intrinsic.h
|
for ac_header in X11/extensions/shape.h X11/extensions/Xrender.h X11/extensions/XTest.h X11/Intrinsic.h
|
||||||
do :
|
do :
|
||||||
as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
|
as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
|
||||||
ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "
|
ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "
|
||||||
# include <X11/Xlib.h>
|
# include <X11/Xlib.h>
|
||||||
# include <X11/Xutil.h>
|
# include <X11/Xutil.h>
|
||||||
|
|
||||||
|
|
||||||
"
|
"
|
||||||
@ -44054,19 +44062,53 @@ if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
|
|||||||
cat >>confdefs.h <<_ACEOF
|
cat >>confdefs.h <<_ACEOF
|
||||||
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
|
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
|
||||||
_ACEOF
|
_ACEOF
|
||||||
X11_A_OK=yes
|
X11_HEADERS_OK=yes
|
||||||
else
|
else
|
||||||
X11_A_OK=no; break
|
X11_HEADERS_OK=no; break
|
||||||
fi
|
fi
|
||||||
|
|
||||||
done
|
done
|
||||||
|
|
||||||
|
|
||||||
# If XLinearGradient isn't available in Xrender.h, signal that it needs to be
|
if test "x$X11_HEADERS_OK" = xno; then
|
||||||
# defined in libawt_xawt.
|
|
||||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if XlinearGradient is defined in Xrender.h" >&5
|
# Print a helpful message on how to acquire the necessary build dependency.
|
||||||
|
# x11 is the help tag: freetype, cups, pulse, alsa etc
|
||||||
|
MISSING_DEPENDENCY=x11
|
||||||
|
|
||||||
|
if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
|
||||||
|
cygwin_help $MISSING_DEPENDENCY
|
||||||
|
elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
|
||||||
|
msys_help $MISSING_DEPENDENCY
|
||||||
|
else
|
||||||
|
PKGHANDLER_COMMAND=
|
||||||
|
|
||||||
|
case $PKGHANDLER in
|
||||||
|
apt-get)
|
||||||
|
apt_help $MISSING_DEPENDENCY ;;
|
||||||
|
yum)
|
||||||
|
yum_help $MISSING_DEPENDENCY ;;
|
||||||
|
port)
|
||||||
|
port_help $MISSING_DEPENDENCY ;;
|
||||||
|
pkgutil)
|
||||||
|
pkgutil_help $MISSING_DEPENDENCY ;;
|
||||||
|
pkgadd)
|
||||||
|
pkgadd_help $MISSING_DEPENDENCY ;;
|
||||||
|
esac
|
||||||
|
|
||||||
|
if test "x$PKGHANDLER_COMMAND" != x; then
|
||||||
|
HELP_MSG="You might be able to fix this by running '$PKGHANDLER_COMMAND'."
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
as_fn_error $? "Could not find all X11 headers (shape.h Xrender.h XTest.h Intrinsic.h). $HELP_MSG" "$LINENO" 5
|
||||||
|
fi
|
||||||
|
|
||||||
|
# If XLinearGradient isn't available in Xrender.h, signal that it needs to be
|
||||||
|
# defined in libawt_xawt.
|
||||||
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if XlinearGradient is defined in Xrender.h" >&5
|
||||||
$as_echo_n "checking if XlinearGradient is defined in Xrender.h... " >&6; }
|
$as_echo_n "checking if XlinearGradient is defined in Xrender.h... " >&6; }
|
||||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||||
/* end confdefs.h. */
|
/* end confdefs.h. */
|
||||||
#include <X11/extensions/Xrender.h>
|
#include <X11/extensions/Xrender.h>
|
||||||
int
|
int
|
||||||
@ -44083,51 +44125,18 @@ $as_echo "yes" >&6; }
|
|||||||
else
|
else
|
||||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
||||||
$as_echo "no" >&6; }
|
$as_echo "no" >&6; }
|
||||||
X_CFLAGS="$X_CFLAGS -DSOLARIS10_NO_XRENDER_STRUCTS"
|
X_CFLAGS="$X_CFLAGS -DSOLARIS10_NO_XRENDER_STRUCTS"
|
||||||
fi
|
fi
|
||||||
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
||||||
|
|
||||||
CFLAGS="$OLD_CFLAGS"
|
CFLAGS="$OLD_CFLAGS"
|
||||||
ac_ext=cpp
|
ac_ext=cpp
|
||||||
ac_cpp='$CXXCPP $CPPFLAGS'
|
ac_cpp='$CXXCPP $CPPFLAGS'
|
||||||
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
|
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
|
||||||
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
|
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
|
||||||
ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
|
ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
|
||||||
|
|
||||||
|
fi # X11_NOT_NEEDED
|
||||||
if test "x$X11_A_OK" = xno && test "x$X11_NOT_NEEDED" != xyes; then
|
|
||||||
|
|
||||||
# Print a helpful message on how to acquire the necessary build dependency.
|
|
||||||
# x11 is the help tag: freetype, cups, pulse, alsa etc
|
|
||||||
MISSING_DEPENDENCY=x11
|
|
||||||
|
|
||||||
if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
|
|
||||||
cygwin_help $MISSING_DEPENDENCY
|
|
||||||
elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
|
|
||||||
msys_help $MISSING_DEPENDENCY
|
|
||||||
else
|
|
||||||
PKGHANDLER_COMMAND=
|
|
||||||
|
|
||||||
case $PKGHANDLER in
|
|
||||||
apt-get)
|
|
||||||
apt_help $MISSING_DEPENDENCY ;;
|
|
||||||
yum)
|
|
||||||
yum_help $MISSING_DEPENDENCY ;;
|
|
||||||
port)
|
|
||||||
port_help $MISSING_DEPENDENCY ;;
|
|
||||||
pkgutil)
|
|
||||||
pkgutil_help $MISSING_DEPENDENCY ;;
|
|
||||||
pkgadd)
|
|
||||||
pkgadd_help $MISSING_DEPENDENCY ;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
if test "x$PKGHANDLER_COMMAND" != x; then
|
|
||||||
HELP_MSG="You might be able to fix this by running '$PKGHANDLER_COMMAND'."
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
as_fn_error $? "Could not find all X11 headers (shape.h Xrender.h XTest.h Intrinsic.h). $HELP_MSG" "$LINENO" 5
|
|
||||||
fi
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -131,7 +131,7 @@ yum_help() {
|
|||||||
pulse)
|
pulse)
|
||||||
PKGHANDLER_COMMAND="sudo yum install pulseaudio-libs-devel" ;;
|
PKGHANDLER_COMMAND="sudo yum install pulseaudio-libs-devel" ;;
|
||||||
x11)
|
x11)
|
||||||
PKGHANDLER_COMMAND="sudo yum install libXtst-devel libXt-devel libXrender-devel" ;;
|
PKGHANDLER_COMMAND="sudo yum install libXtst-devel libXt-devel libXrender-devel libXi-devel" ;;
|
||||||
ccache)
|
ccache)
|
||||||
PKGHANDLER_COMMAND="sudo yum install ccache" ;;
|
PKGHANDLER_COMMAND="sudo yum install ccache" ;;
|
||||||
esac
|
esac
|
||||||
|
|||||||
@ -91,85 +91,93 @@ AC_DEFUN_ONCE([LIB_SETUP_X11],
|
|||||||
# Check for X Windows
|
# Check for X Windows
|
||||||
#
|
#
|
||||||
|
|
||||||
# Check if the user has specified sysroot, but not --x-includes or --x-libraries.
|
if test "x$X11_NOT_NEEDED" = xyes; then
|
||||||
# Make a simple check for the libraries at the sysroot, and setup --x-includes and
|
if test "x${with_x}" != x; then
|
||||||
# --x-libraries for the sysroot, if that seems to be correct.
|
AC_MSG_WARN([X11 is not used, so --with-x is ignored])
|
||||||
if test "x$OPENJDK_TARGET_OS" = "xlinux"; then
|
fi
|
||||||
if test "x$SYSROOT" != "x"; then
|
X_CFLAGS=
|
||||||
if test "x$x_includes" = xNONE; then
|
X_LIBS=
|
||||||
if test -f "$SYSROOT/usr/X11R6/include/X11/Xlib.h"; then
|
else
|
||||||
x_includes="$SYSROOT/usr/X11R6/include"
|
# Check if the user has specified sysroot, but not --x-includes or --x-libraries.
|
||||||
elif test -f "$SYSROOT/usr/include/X11/Xlib.h"; then
|
# Make a simple check for the libraries at the sysroot, and setup --x-includes and
|
||||||
x_includes="$SYSROOT/usr/include"
|
# --x-libraries for the sysroot, if that seems to be correct.
|
||||||
|
if test "x$OPENJDK_TARGET_OS" = "xlinux"; then
|
||||||
|
if test "x$SYSROOT" != "x"; then
|
||||||
|
if test "x$x_includes" = xNONE; then
|
||||||
|
if test -f "$SYSROOT/usr/X11R6/include/X11/Xlib.h"; then
|
||||||
|
x_includes="$SYSROOT/usr/X11R6/include"
|
||||||
|
elif test -f "$SYSROOT/usr/include/X11/Xlib.h"; then
|
||||||
|
x_includes="$SYSROOT/usr/include"
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
fi
|
if test "x$x_libraries" = xNONE; then
|
||||||
if test "x$x_libraries" = xNONE; then
|
if test -f "$SYSROOT/usr/X11R6/lib/libX11.so"; then
|
||||||
if test -f "$SYSROOT/usr/X11R6/lib/libX11.so"; then
|
x_libraries="$SYSROOT/usr/X11R6/lib"
|
||||||
x_libraries="$SYSROOT/usr/X11R6/lib"
|
elif test "$SYSROOT/usr/lib64/libX11.so" && test "x$OPENJDK_TARGET_CPU_BITS" = x64; then
|
||||||
elif test "$SYSROOT/usr/lib64/libX11.so" && test "x$OPENJDK_TARGET_CPU_BITS" = x64; then
|
x_libraries="$SYSROOT/usr/lib64"
|
||||||
x_libraries="$SYSROOT/usr/lib64"
|
elif test -f "$SYSROOT/usr/lib/libX11.so"; then
|
||||||
elif test -f "$SYSROOT/usr/lib/libX11.so"; then
|
x_libraries="$SYSROOT/usr/lib"
|
||||||
x_libraries="$SYSROOT/usr/lib"
|
fi
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
fi
|
|
||||||
|
|
||||||
# Now let autoconf do it's magic
|
# Now let autoconf do it's magic
|
||||||
AC_PATH_X
|
AC_PATH_X
|
||||||
AC_PATH_XTRA
|
AC_PATH_XTRA
|
||||||
|
|
||||||
# AC_PATH_XTRA creates X_LIBS and sometimes adds -R flags. When cross compiling
|
# AC_PATH_XTRA creates X_LIBS and sometimes adds -R flags. When cross compiling
|
||||||
# this doesn't make sense so we remove it.
|
# this doesn't make sense so we remove it.
|
||||||
if test "x$COMPILE_TYPE" = xcross; then
|
if test "x$COMPILE_TYPE" = xcross; then
|
||||||
X_LIBS=`$ECHO $X_LIBS | $SED 's/-R \{0,1\}[[^ ]]*//g'`
|
X_LIBS=`$ECHO $X_LIBS | $SED 's/-R \{0,1\}[[^ ]]*//g'`
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if test "x$no_x" = xyes && test "x$X11_NOT_NEEDED" != xyes; then
|
if test "x$no_x" = xyes; then
|
||||||
HELP_MSG_MISSING_DEPENDENCY([x11])
|
HELP_MSG_MISSING_DEPENDENCY([x11])
|
||||||
AC_MSG_ERROR([Could not find X11 libraries. $HELP_MSG])
|
AC_MSG_ERROR([Could not find X11 libraries. $HELP_MSG])
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if test "x$OPENJDK_TARGET_OS" = xsolaris; then
|
if test "x$OPENJDK_TARGET_OS" = xsolaris; then
|
||||||
OPENWIN_HOME="/usr/openwin"
|
OPENWIN_HOME="/usr/openwin"
|
||||||
X_CFLAGS="-I$SYSROOT$OPENWIN_HOME/include -I$SYSROOT$OPENWIN_HOME/include/X11/extensions"
|
X_CFLAGS="-I$SYSROOT$OPENWIN_HOME/include -I$SYSROOT$OPENWIN_HOME/include/X11/extensions"
|
||||||
X_LIBS="-L$SYSROOT$OPENWIN_HOME/sfw/lib$OPENJDK_TARGET_CPU_ISADIR \
|
X_LIBS="-L$SYSROOT$OPENWIN_HOME/sfw/lib$OPENJDK_TARGET_CPU_ISADIR \
|
||||||
-L$SYSROOT$OPENWIN_HOME/lib$OPENJDK_TARGET_CPU_ISADIR \
|
-L$SYSROOT$OPENWIN_HOME/lib$OPENJDK_TARGET_CPU_ISADIR \
|
||||||
-R$OPENWIN_HOME/sfw/lib$OPENJDK_TARGET_CPU_ISADIR \
|
-R$OPENWIN_HOME/sfw/lib$OPENJDK_TARGET_CPU_ISADIR \
|
||||||
-R$OPENWIN_HOME/lib$OPENJDK_TARGET_CPU_ISADIR"
|
-R$OPENWIN_HOME/lib$OPENJDK_TARGET_CPU_ISADIR"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
AC_LANG_PUSH(C)
|
AC_LANG_PUSH(C)
|
||||||
OLD_CFLAGS="$CFLAGS"
|
OLD_CFLAGS="$CFLAGS"
|
||||||
CFLAGS="$CFLAGS $SYSROOT_CFLAGS $X_CFLAGS"
|
CFLAGS="$CFLAGS $SYSROOT_CFLAGS $X_CFLAGS"
|
||||||
|
|
||||||
# Need to include Xlib.h and Xutil.h to avoid "present but cannot be compiled" warnings on Solaris 10
|
# 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_A_OK=yes],
|
[X11_HEADERS_OK=yes],
|
||||||
[X11_A_OK=no; break],
|
[X11_HEADERS_OK=no; break],
|
||||||
[
|
[
|
||||||
# include <X11/Xlib.h>
|
# include <X11/Xlib.h>
|
||||||
# include <X11/Xutil.h>
|
# include <X11/Xutil.h>
|
||||||
]
|
]
|
||||||
)
|
)
|
||||||
|
|
||||||
# If XLinearGradient isn't available in Xrender.h, signal that it needs to be
|
if test "x$X11_HEADERS_OK" = xno; then
|
||||||
# defined in libawt_xawt.
|
HELP_MSG_MISSING_DEPENDENCY([x11])
|
||||||
AC_MSG_CHECKING([if XlinearGradient is defined in Xrender.h])
|
AC_MSG_ERROR([Could not find all X11 headers (shape.h Xrender.h XTest.h Intrinsic.h). $HELP_MSG])
|
||||||
AC_COMPILE_IFELSE(
|
fi
|
||||||
[AC_LANG_PROGRAM([[#include <X11/extensions/Xrender.h>]],
|
|
||||||
[[XLinearGradient x;]])],
|
|
||||||
[AC_MSG_RESULT([yes])],
|
|
||||||
[AC_MSG_RESULT([no])
|
|
||||||
X_CFLAGS="$X_CFLAGS -DSOLARIS10_NO_XRENDER_STRUCTS"])
|
|
||||||
|
|
||||||
CFLAGS="$OLD_CFLAGS"
|
# If XLinearGradient isn't available in Xrender.h, signal that it needs to be
|
||||||
AC_LANG_POP(C)
|
# defined in libawt_xawt.
|
||||||
|
AC_MSG_CHECKING([if XlinearGradient is defined in Xrender.h])
|
||||||
|
AC_COMPILE_IFELSE(
|
||||||
|
[AC_LANG_PROGRAM([[#include <X11/extensions/Xrender.h>]],
|
||||||
|
[[XLinearGradient x;]])],
|
||||||
|
[AC_MSG_RESULT([yes])],
|
||||||
|
[AC_MSG_RESULT([no])
|
||||||
|
X_CFLAGS="$X_CFLAGS -DSOLARIS10_NO_XRENDER_STRUCTS"])
|
||||||
|
|
||||||
if test "x$X11_A_OK" = xno && test "x$X11_NOT_NEEDED" != xyes; then
|
CFLAGS="$OLD_CFLAGS"
|
||||||
HELP_MSG_MISSING_DEPENDENCY([x11])
|
AC_LANG_POP(C)
|
||||||
AC_MSG_ERROR([Could not find all X11 headers (shape.h Xrender.h XTest.h Intrinsic.h). $HELP_MSG])
|
fi # X11_NOT_NEEDED
|
||||||
fi
|
|
||||||
|
|
||||||
AC_SUBST(X_CFLAGS)
|
AC_SUBST(X_CFLAGS)
|
||||||
AC_SUBST(X_LIBS)
|
AC_SUBST(X_LIBS)
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user