Mercurial > hg > jdk9-shenandoah
changeset 1567:2c7ff240d69e
8130303: Fix bogus check for libX11.so in libraries.m4
Reviewed-by: simonis, erikj
Contributed-by: matthias.baesken@sap.com
author | simonis |
---|---|
date | Thu, 02 Jul 2015 09:38:41 +0200 |
parents | 32f6be9541fa |
children | 8582c35016fb e73e50a98134 e861317f9c07 |
files | common/autoconf/generated-configure.sh common/autoconf/libraries.m4 |
diffstat | 2 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/common/autoconf/generated-configure.sh Tue Jun 30 11:20:42 2015 -0700 +++ b/common/autoconf/generated-configure.sh Thu Jul 02 09:38:41 2015 +0200 @@ -4364,7 +4364,7 @@ #CUSTOM_AUTOCONF_INCLUDE # Do not change or remove the following line, it is needed for consistency checks: -DATE_WHEN_GENERATED=1434614912 +DATE_WHEN_GENERATED=1435822080 ############################################################################### # @@ -42961,7 +42961,7 @@ if test "x$x_libraries" = xNONE; then if test -f "$SYSROOT/usr/X11R6/lib/libX11.so"; then x_libraries="$SYSROOT/usr/X11R6/lib" - elif test "$SYSROOT/usr/lib64/libX11.so" && test "x$OPENJDK_TARGET_CPU_BITS" = x64; then + elif test -f "$SYSROOT/usr/lib64/libX11.so" && test "x$OPENJDK_TARGET_CPU_BITS" = x64; then x_libraries="$SYSROOT/usr/lib64" elif test -f "$SYSROOT/usr/lib/libX11.so"; then x_libraries="$SYSROOT/usr/lib"
--- a/common/autoconf/libraries.m4 Tue Jun 30 11:20:42 2015 -0700 +++ b/common/autoconf/libraries.m4 Thu Jul 02 09:38:41 2015 +0200 @@ -113,7 +113,7 @@ if test "x$x_libraries" = xNONE; then if test -f "$SYSROOT/usr/X11R6/lib/libX11.so"; then x_libraries="$SYSROOT/usr/X11R6/lib" - elif test "$SYSROOT/usr/lib64/libX11.so" && test "x$OPENJDK_TARGET_CPU_BITS" = x64; then + elif test -f "$SYSROOT/usr/lib64/libX11.so" && test "x$OPENJDK_TARGET_CPU_BITS" = x64; then x_libraries="$SYSROOT/usr/lib64" elif test -f "$SYSROOT/usr/lib/libX11.so"; then x_libraries="$SYSROOT/usr/lib"