Mercurial > jdk8-mips64-public / changeset

     1.1 --- a/common/autoconf/generated-configure.sh	Wed Oct 23 13:05:58 2013 +0200
     1.2 +++ b/common/autoconf/generated-configure.sh	Wed Oct 23 17:03:19 2013 +0200
     1.3 @@ -3864,7 +3864,7 @@
     1.4  #CUSTOM_AUTOCONF_INCLUDE
     1.5  
     1.6  # Do not change or remove the following line, it is needed for consistency checks:
     1.7 -DATE_WHEN_GENERATED=1382526194
     1.8 +DATE_WHEN_GENERATED=1382540536
     1.9  
    1.10  ###############################################################################
    1.11  #
    1.12 @@ -30857,16 +30857,6 @@
    1.13      as_fn_error $? "Could not find X11 libraries. $HELP_MSG" "$LINENO" 5
    1.14    fi
    1.15  
    1.16 -  # Some of the old makefiles require a setting of OPENWIN_HOME
    1.17 -  # Since the X11R6 directory has disappeared on later Linuxes,
    1.18 -  # we need to probe for it.
    1.19 -  if test "x$OPENJDK_TARGET_OS" = xlinux; then
    1.20 -    if test -d "$SYS_ROOT/usr/X11R6"; then
    1.21 -      OPENWIN_HOME="$SYS_ROOT/usr/X11R6"
    1.22 -    elif test -d "$SYS_ROOT/usr/include/X11"; then
    1.23 -      OPENWIN_HOME="$SYS_ROOT/usr"
    1.24 -    fi
    1.25 -  fi
    1.26    if test "x$OPENJDK_TARGET_OS" = xsolaris; then
    1.27      OPENWIN_HOME="/usr/openwin"
    1.28    fi

     2.1 --- a/common/autoconf/libraries.m4	Wed Oct 23 13:05:58 2013 +0200
     2.2 +++ b/common/autoconf/libraries.m4	Wed Oct 23 17:03:19 2013 +0200
     2.3 @@ -136,16 +136,6 @@
     2.4      AC_MSG_ERROR([Could not find X11 libraries. $HELP_MSG])
     2.5    fi
     2.6  
     2.7 -  # Some of the old makefiles require a setting of OPENWIN_HOME
     2.8 -  # Since the X11R6 directory has disappeared on later Linuxes,
     2.9 -  # we need to probe for it.
    2.10 -  if test "x$OPENJDK_TARGET_OS" = xlinux; then
    2.11 -    if test -d "$SYS_ROOT/usr/X11R6"; then
    2.12 -      OPENWIN_HOME="$SYS_ROOT/usr/X11R6"
    2.13 -    elif test -d "$SYS_ROOT/usr/include/X11"; then
    2.14 -      OPENWIN_HOME="$SYS_ROOT/usr"
    2.15 -    fi
    2.16 -  fi
    2.17    if test "x$OPENJDK_TARGET_OS" = xsolaris; then
    2.18      OPENWIN_HOME="/usr/openwin"
    2.19    fi