Mercurial Mercurial > jdk-sandbox / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
8130303: Fix bogus check for libX11.so in libraries.m4
authorsimonis
Thu, 02 Jul 2015 09:38:41 +0200
changeset 31327 8c2512d63fac
parent 31326 4e7196149801
child 31328 7dd7a38425a8
child 31568 baa55588b1b4
child 31575 cf1261b1937f
8130303: Fix bogus check for libX11.so in libraries.m4 Reviewed-by: simonis, erikj Contributed-by: matthias.baesken@sap.com
common/autoconf/generated-configure.sh file | annotate | diff | comparison | revisions
common/autoconf/libraries.m4 file | annotate | diff | comparison | revisions 
--- 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"
jdk-sandbox