changeset 1174:1a82bfcb7d4b

. Allow X11R7 as an aaceptable version of X11, as that is used on NetBSD. Authored by: Christos Zoulas <christos@zoulas.com>
author Greg Lewis <glewis@eyesbeyond.com>
date Sat, 14 Mar 2015 10:00:39 -0700
parents 5789206ce65b
children 37f198f10b62
files common/autoconf/libraries.m4
diffstat 1 files changed, 6 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/common/autoconf/libraries.m4	Sat Mar 14 09:47:35 2015 -0700
+++ b/common/autoconf/libraries.m4	Sat Mar 14 10:00:39 2015 -0700
@@ -112,14 +112,18 @@
   # --x-libraries for the sysroot, if that seems to be correct.
   if test "x$SYS_ROOT" != "x/"; then
     if test "x$x_includes" = xNONE; then
-      if test -f "$SYS_ROOT/usr/X11R6/include/X11/Xlib.h"; then
+      if test -f "$SYS_ROOT/usr/X11R7/include/X11/Xlib.h"; then
+        x_includes="$SYS_ROOT/usr/X11R7/include"
+      elif test -f "$SYS_ROOT/usr/X11R6/include/X11/Xlib.h"; then
         x_includes="$SYS_ROOT/usr/X11R6/include"
       elif test -f "$SYS_ROOT/usr/include/X11/Xlib.h"; then
         x_includes="$SYS_ROOT/usr/include"
       fi
     fi
     if test "x$x_libraries" = xNONE; then
-      if test -f "$SYS_ROOT/usr/X11R6/lib/libX11.so"; then
+      if test -f "$SYS_ROOT/usr/X11R7/lib/libX11.so"; then
+        x_libraries="$SYS_ROOT/usr/X11R7/lib"
+      elif test -f "$SYS_ROOT/usr/X11R6/lib/libX11.so"; then
         x_libraries="$SYS_ROOT/usr/X11R6/lib"
       elif test "$SYS_ROOT/usr/lib64/libX11.so" && test "x$OPENJDK_TARGET_CPU_BITS" = x64; then
         x_libraries="$SYS_ROOT/usr/lib64"