# HG changeset patch
# User lana
# Date 1364928909 25200
# Node ID bcbdbcfe7ed88fcb7a6b8636665cc7394f13ae6f
# Parent  760074bec0126a2615aff28af395f6f126ad4b77# Parent  a1bb1a0df1facba7ed2c868bbe129865b1908a54
Merge

diff -r 760074bec012 -r bcbdbcfe7ed8 .hgtags
--- a/.hgtags	Mon Apr 01 21:11:51 2013 -0700
+++ b/.hgtags	Tue Apr 02 11:55:09 2013 -0700
@@ -203,3 +203,5 @@
 91d35211e74464dca5edf9b66ab01d0d0d8cded7 jdk8-b79
 907a926d3c96472f357617b48b6b968ea855c23c jdk8-b80
 145dbc56f931c134e837b675b9e6e7bf08902e93 jdk8-b81
+29153d0df68f84162ffe8c2cf4f402a3f2245e85 jdk8-b82
+466685ba01bfb7bc1e1ac61490fd8c0f3cc18763 jdk8-b83
diff -r 760074bec012 -r bcbdbcfe7ed8 common/autoconf/configure.ac
--- a/common/autoconf/configure.ac	Mon Apr 01 21:11:51 2013 -0700
+++ b/common/autoconf/configure.ac	Tue Apr 02 11:55:09 2013 -0700
@@ -194,6 +194,7 @@
 ###############################################################################
 
 JDKOPT_SETUP_BUILD_TWEAKS
+JDKOPT_DETECT_INTREE_EC
 
 ###############################################################################
 #
diff -r 760074bec012 -r bcbdbcfe7ed8 common/autoconf/generated-configure.sh
--- a/common/autoconf/generated-configure.sh	Mon Apr 01 21:11:51 2013 -0700
+++ b/common/autoconf/generated-configure.sh	Tue Apr 02 11:55:09 2013 -0700
@@ -612,6 +612,7 @@
 JOBS
 MEMORY_SIZE
 NUM_CORES
+ENABLE_INTREE_EC
 SALIB_NAME
 HOTSPOT_MAKE_ARGS
 FIXPATH
@@ -3752,7 +3753,7 @@
 #CUSTOM_AUTOCONF_INCLUDE
 
 # Do not change or remove the following line, it is needed for consistency checks:
-DATE_WHEN_GENERATED=1363150186
+DATE_WHEN_GENERATED=1363706268
 
 ###############################################################################
 #
@@ -10786,6 +10787,12 @@
 
 ###############################################################################
 #
+# Enable or disable the elliptic curve crypto implementation
+#
+
+
+###############################################################################
+#
 # Compress jars
 #
 COMPRESS_JARS=false
@@ -29823,7 +29830,7 @@
 _ACEOF
  X11_A_OK=yes
 else
-  X11_A_OK=no
+  X11_A_OK=no; break
 fi
 
 done
@@ -31694,6 +31701,22 @@
 
 
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if elliptic curve crypto implementation is present" >&5
+$as_echo_n "checking if elliptic curve crypto implementation is present... " >&6; }
+
+if test -d "${SRC_ROOT}/jdk/src/share/native/sun/security/ec/impl"; then
+    ENABLE_INTREE_EC=yes
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+    ENABLE_INTREE_EC=no
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+
+
 ###############################################################################
 #
 # Configure parts of the build that only affect the build performance,
diff -r 760074bec012 -r bcbdbcfe7ed8 common/autoconf/jdk-options.m4
--- a/common/autoconf/jdk-options.m4	Mon Apr 01 21:11:51 2013 -0700
+++ b/common/autoconf/jdk-options.m4	Tue Apr 02 11:55:09 2013 -0700
@@ -366,6 +366,25 @@
 
 ###############################################################################
 #
+# Enable or disable the elliptic curve crypto implementation
+#
+AC_DEFUN_ONCE([JDKOPT_DETECT_INTREE_EC],
+[
+AC_MSG_CHECKING([if elliptic curve crypto implementation is present])
+
+if test -d "${SRC_ROOT}/jdk/src/share/native/sun/security/ec/impl"; then
+    ENABLE_INTREE_EC=yes
+    AC_MSG_RESULT([yes])
+else
+    ENABLE_INTREE_EC=no
+    AC_MSG_RESULT([no])
+fi
+
+AC_SUBST(ENABLE_INTREE_EC)
+])
+
+###############################################################################
+#
 # Compress jars
 #
 COMPRESS_JARS=false
diff -r 760074bec012 -r bcbdbcfe7ed8 common/autoconf/libraries.m4
--- a/common/autoconf/libraries.m4	Mon Apr 01 21:11:51 2013 -0700
+++ b/common/autoconf/libraries.m4	Tue Apr 02 11:55:09 2013 -0700
@@ -182,7 +182,7 @@
 # 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>
                  ])
diff -r 760074bec012 -r bcbdbcfe7ed8 common/autoconf/spec.gmk.in
--- a/common/autoconf/spec.gmk.in	Mon Apr 01 21:11:51 2013 -0700
+++ b/common/autoconf/spec.gmk.in	Tue Apr 02 11:55:09 2013 -0700
@@ -539,6 +539,7 @@
 
 # Build setup
 ENABLE_JFR=@ENABLE_JFR@
+ENABLE_INTREE_EC=@ENABLE_INTREE_EC@
 USE_EXTERNAL_LIBJPEG:=@USE_EXTERNAL_LIBJPEG@
 USE_EXTERNAL_LIBGIF:=@USE_EXTERNAL_LIBGIF@
 USE_EXTERNAL_LIBZ:=@USE_EXTERNAL_LIBZ@