--- old/common/autoconf/configure.ac	2013-03-13 15:59:07.571972282 -0400
+++ new/common/autoconf/configure.ac	2013-03-13 15:59:07.475971314 -0400
@@ -194,6 +194,7 @@
 ###############################################################################
 
 JDKOPT_SETUP_BUILD_TWEAKS
+JDKOPT_DETECT_INTREE_EC
 
 ###############################################################################
 #
--- old/common/autoconf/generated-configure.sh	2013-03-13 15:59:27.623174386 -0400
+++ new/common/autoconf/generated-configure.sh	2013-03-13 15:59:27.514173287 -0400
@@ -612,6 +612,7 @@
 JOBS
 MEMORY_SIZE
 NUM_CORES
+DISABLE_INTREE_EC
 SALIB_NAME
 HOTSPOT_MAKE_ARGS
 FIXPATH
@@ -3751,7 +3752,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=1363203123
 
 ###############################################################################
 #
@@ -10785,6 +10786,12 @@
 
 ###############################################################################
 #
+# Enable or disable the elliptic curve crypto implementation
+#
+
+
+###############################################################################
+#
 # Compress jars
 #
 COMPRESS_JARS=false
@@ -31668,6 +31675,22 @@
 fi
 
 
+
+
+{ $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
+    DISABLE_INTREE_EC=
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+    DISABLE_INTREE_EC=true
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
 
 
 ###############################################################################
--- old/common/autoconf/jdk-options.m4	2013-03-13 15:59:28.948187740 -0400
+++ new/common/autoconf/jdk-options.m4	2013-03-13 15:59:28.848186732 -0400
@@ -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
+    DISABLE_INTREE_EC=
+    AC_MSG_RESULT([yes])
+else
+    DISABLE_INTREE_EC=true
+    AC_MSG_RESULT([no])
+fi
+
+AC_SUBST(DISABLE_INTREE_EC)
+])
+
+###############################################################################
+#
 # Compress jars
 #
 COMPRESS_JARS=false
--- old/common/autoconf/spec.gmk.in	2013-03-13 15:59:29.677195087 -0400
+++ new/common/autoconf/spec.gmk.in	2013-03-13 15:59:29.580194109 -0400
@@ -536,6 +536,7 @@
 
 # Build setup
 ENABLE_JFR=@ENABLE_JFR@
+DISABLE_INTREE_EC=@DISABLE_INTREE_EC@
 USE_EXTERNAL_LIBJPEG:=@USE_EXTERNAL_LIBJPEG@
 USE_EXTERNAL_LIBGIF:=@USE_EXTERNAL_LIBGIF@
 USE_EXTERNAL_LIBZ:=@USE_EXTERNAL_LIBZ@
--- old/jdk/makefiles/CompileNativeLibraries.gmk	2013-03-13 15:59:30.621204601 -0400
+++ new/jdk/makefiles/CompileNativeLibraries.gmk	2013-03-13 15:59:30.413202504 -0400
@@ -2666,10 +2666,7 @@
 ##########################################################################################
 
 ifndef DISABLE_INTREE_EC
-#
-# TODO Set DISABLE_INTREE_EC in configure if src/share/native/sun/security/ec/impl
-#      is not present
-#
+
 BUILD_LIBSUNEC_FLAGS:= -I$(JDK_TOPDIR)/src/share/native/sun/security/ec \
                        -I$(JDK_TOPDIR)/src/share/native/sun/security/ec/impl