diff options
| author | erikj <none@none> | 2013-10-23 17:03:19 +0200 |
|---|---|---|
| committer | erikj <none@none> | 2013-10-23 17:03:19 +0200 |
| commit | 7065ad1ae2c05e3681c83c5c3c94a0be198d30a3 (patch) | |
| tree | 9e5fd59feedd48bf6963ae44c01701abb3105d7f | |
| parent | dd53adf4359b7ea081f2e913bcfcd38f8c3d5697 (diff) | |
8026888: Licensee build failure due to wrong libs being calledjdk8-b113
Reviewed-by: tbell, ihse, simonis
| -rw-r--r-- | common/autoconf/generated-configure.sh | 12 | ||||
| -rw-r--r-- | common/autoconf/libraries.m4 | 10 |
2 files changed, 1 insertions, 21 deletions
diff --git a/common/autoconf/generated-configure.sh b/common/autoconf/generated-configure.sh index e04d219..0c43de6 100644 --- a/common/autoconf/generated-configure.sh +++ b/common/autoconf/generated-configure.sh @@ -3864,7 +3864,7 @@ fi #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 @@ fi 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 diff --git a/common/autoconf/libraries.m4 b/common/autoconf/libraries.m4 index f860ae4..c41da30 100644 --- a/common/autoconf/libraries.m4 +++ b/common/autoconf/libraries.m4 @@ -136,16 +136,6 @@ AC_DEFUN_ONCE([LIB_SETUP_X11], 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 |