make/autoconf/lib-x11.m4

rev 59102 : imported patch build

*** 86,102 ****
      if test "x$no_x" = xyes; then
        HELP_MSG_MISSING_DEPENDENCY([x11])
        AC_MSG_ERROR([Could not find X11 libraries. $HELP_MSG])
      fi
  
-     if test "x$OPENJDK_TARGET_OS" = xsolaris; then
-       OPENWIN_HOME="/usr/openwin"
-       X_CFLAGS="-I$SYSROOT$OPENWIN_HOME/include -I$SYSROOT$OPENWIN_HOME/include/X11/extensions"
-       X_LIBS="-L$SYSROOT$OPENWIN_HOME/lib$OPENJDK_TARGET_CPU_ISADIR \
-           -R$OPENWIN_HOME/lib$OPENJDK_TARGET_CPU_ISADIR"
-     fi
- 
      AC_LANG_PUSH(C)
      OLD_CFLAGS="$CFLAGS"
      CFLAGS="$CFLAGS $SYSROOT_CFLAGS $X_CFLAGS"
  
      HEADERS_TO_CHECK="X11/extensions/shape.h X11/extensions/Xrender.h X11/extensions/XTest.h X11/Intrinsic.h"
--- 86,95 ----
*** 120,139 ****
      if test "x$X11_HEADERS_OK" = xno; then
        HELP_MSG_MISSING_DEPENDENCY([x11])
        AC_MSG_ERROR([Could not find all X11 headers (shape.h Xrender.h Xrandr.h XTest.h Intrinsic.h). $HELP_MSG])
      fi
  
-     # If XLinearGradient isn't available in Xrender.h, signal that it needs to be
-     # 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"])
- 
      CFLAGS="$OLD_CFLAGS"
      AC_LANG_POP(C)
    fi # NEEDS_LIB_X11
  
    AC_SUBST(X_CFLAGS)
--- 113,122 ----