changeset 874:6ba4c7cb623e jdk8-b113

8026888: Licensee build failure due to wrong libs being called Reviewed-by: tbell, ihse, simonis
author erikj
date Wed, 23 Oct 2013 17:03:19 +0200
parents 6f19b2440412
children a36df87b3901 b098ee22aa97
files common/autoconf/generated-configure.sh common/autoconf/libraries.m4
diffstat 2 files changed, 1 insertions(+), 21 deletions(-) [+]
line wrap: on
line diff
--- a/common/autoconf/generated-configure.sh	Wed Oct 23 13:05:58 2013 +0200
+++ b/common/autoconf/generated-configure.sh	Wed Oct 23 17:03:19 2013 +0200
@@ -3864,7 +3864,7 @@
 #CUSTOM_AUTOCONF_INCLUDE
 
 # Do not change or remove the following line, it is needed for consistency checks:
-DATE_WHEN_GENERATED=1382526194
+DATE_WHEN_GENERATED=1382540536
 
 ###############################################################################
 #
@@ -30857,16 +30857,6 @@
     as_fn_error $? "Could not find X11 libraries. $HELP_MSG" "$LINENO" 5
   fi
 
-  # Some of the old makefiles require a setting of OPENWIN_HOME
-  # Since the X11R6 directory has disappeared on later Linuxes,
-  # we need to probe for it.
-  if test "x$OPENJDK_TARGET_OS" = xlinux; then
-    if test -d "$SYS_ROOT/usr/X11R6"; then
-      OPENWIN_HOME="$SYS_ROOT/usr/X11R6"
-    elif test -d "$SYS_ROOT/usr/include/X11"; then
-      OPENWIN_HOME="$SYS_ROOT/usr"
-    fi
-  fi
   if test "x$OPENJDK_TARGET_OS" = xsolaris; then
     OPENWIN_HOME="/usr/openwin"
   fi
--- a/common/autoconf/libraries.m4	Wed Oct 23 13:05:58 2013 +0200
+++ b/common/autoconf/libraries.m4	Wed Oct 23 17:03:19 2013 +0200
@@ -136,16 +136,6 @@
     AC_MSG_ERROR([Could not find X11 libraries. $HELP_MSG])
   fi
 
-  # Some of the old makefiles require a setting of OPENWIN_HOME
-  # Since the X11R6 directory has disappeared on later Linuxes,
-  # we need to probe for it.
-  if test "x$OPENJDK_TARGET_OS" = xlinux; then
-    if test -d "$SYS_ROOT/usr/X11R6"; then
-      OPENWIN_HOME="$SYS_ROOT/usr/X11R6"
-    elif test -d "$SYS_ROOT/usr/include/X11"; then
-      OPENWIN_HOME="$SYS_ROOT/usr"
-    fi
-  fi
   if test "x$OPENJDK_TARGET_OS" = xsolaris; then
     OPENWIN_HOME="/usr/openwin"
   fi