From 923f6651262775804ed077ad63d834094dc7589b Mon Sep 17 00:00:00 2001
From: Andrew John Hughes <andrew@openjdk.org>
Date: Thu, 10 Sep 2009 19:04:25 +0100
Subject: [PATCH] 6882745: Add DISABLE_INTREE_EC option to make new EC provider
 optional

Don't build the ec subdirectory when DISABLE_INTREE_EC is defined.

Reviewed-by: vinnie
---
 jdk/make/sun/security/Makefile | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/jdk/make/sun/security/Makefile b/jdk/make/sun/security/Makefile
index 2b7cc6b2ab3..92371cc60cb 100644
--- a/jdk/make/sun/security/Makefile
+++ b/jdk/make/sun/security/Makefile
@@ -60,8 +60,15 @@ ifeq ($(PLATFORM), windows)
   endif
 endif
 
-SUBDIRS = ec other action util tools jgss krb5 smartcardio $(PKCS11) \
-          $(JGSS_WRAPPER) $(MSCAPI)
+# Build in-tree elliptic curve crypto provider only when
+# DISABLE_INTREE_EC is not set
+INTREE_EC = ec
+ifdef DISABLE_INTREE_EC
+  INTREE_EC =
+endif
+
+SUBDIRS = $(INTREE_EC) other action util tools jgss krb5 smartcardio \
+	  $(PKCS11) $(JGSS_WRAPPER) $(MSCAPI)
 
 all build clean clobber::
 	$(SUBDIRS-loop)