aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoromajid <none@none>2013-03-19 11:25:05 -0400
committeromajid <none@none>2013-03-19 11:25:05 -0400
commit551feb55c87f7f73c5a9adf574a3221b7a1c2d6d (patch)
treedeae85cd77c8ca58103b89cac6925e85a8650161
parentc19cf40b8482149799b7a53b1d04a4fda6ac55b8 (diff)
8010277: Configure doesn't fail when Xrender.h is missingjdk8-b82
Reviewed-by: andrew
-rw-r--r--common/autoconf/generated-configure.sh4
-rw-r--r--common/autoconf/libraries.m42
2 files changed, 3 insertions, 3 deletions
diff --git a/common/autoconf/generated-configure.sh b/common/autoconf/generated-configure.sh
index 85a453c..4d9ec98 100644
--- a/common/autoconf/generated-configure.sh
+++ b/common/autoconf/generated-configure.sh
@@ -3753,7 +3753,7 @@ fi
#CUSTOM_AUTOCONF_INCLUDE
# Do not change or remove the following line, it is needed for consistency checks:
-DATE_WHEN_GENERATED=1363617192
+DATE_WHEN_GENERATED=1363706268
###############################################################################
#
@@ -29830,7 +29830,7 @@ if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
_ACEOF
X11_A_OK=yes
else
- X11_A_OK=no
+ X11_A_OK=no; break
fi
done
diff --git a/common/autoconf/libraries.m4 b/common/autoconf/libraries.m4
index 91b0a84..6cc9d63 100644
--- a/common/autoconf/libraries.m4
+++ b/common/autoconf/libraries.m4
@@ -182,7 +182,7 @@ CFLAGS="$CFLAGS $X_CFLAGS"
# Need to include Xlib.h and Xutil.h to avoid "present but cannot be compiled" warnings on Solaris 10
AC_CHECK_HEADERS([X11/extensions/shape.h X11/extensions/Xrender.h X11/extensions/XTest.h],
[X11_A_OK=yes],
- [X11_A_OK=no],
+ [X11_A_OK=no; break],
[ # include <X11/Xlib.h>
# include <X11/Xutil.h>
])