make/autoconf/lib-x11.m4

rev 52571 : 8213944: Fix AIX build after the removal of Xrandr.h and add a configure check for it

*** 1,7 ****
  #
! # Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  #
  # This code is free software; you can redistribute it and/or modify it
  # under the terms of the GNU General Public License version 2 only, as
  # published by the Free Software Foundation.  Oracle designates this
--- 1,7 ----
  #
! # Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  #
  # This code is free software; you can redistribute it and/or modify it
  # under the terms of the GNU General Public License version 2 only, as
  # published by the Free Software Foundation.  Oracle designates this
*** 97,119 ****
  
      AC_LANG_PUSH(C)
      OLD_CFLAGS="$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
!     AC_CHECK_HEADERS([X11/extensions/shape.h X11/extensions/Xrender.h X11/extensions/XTest.h X11/Intrinsic.h],
          [X11_HEADERS_OK=yes],
          [X11_HEADERS_OK=no; break],
          [
            # include <X11/Xlib.h>
            # include <X11/Xutil.h>
          ]
      )
  
      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 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])
--- 97,125 ----
  
      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"
+     # There is no Xrandr extension on AIX
+     if test "x$OPENJDK_TARGET_OS" != xaix; then
+       HEADERS_TO_CHECK="$HEADERS_TO_CHECK X11/extensions/Xrandr.h"
+     fi
+ 
      # Need to include Xlib.h and Xutil.h to avoid "present but cannot be compiled" warnings on Solaris 10
!     AC_CHECK_HEADERS([$HEADERS_TO_CHECK],
          [X11_HEADERS_OK=yes],
          [X11_HEADERS_OK=no; break],
          [
            # include <X11/Xlib.h>
            # include <X11/Xutil.h>
          ]
      )
  
      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 Xrander.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])