From 31a3c3fa8fd2195dc8b3931d4e5c0ccda9089bb1 Mon Sep 17 00:00:00 2001
From: "julien.pierre.bugs%sun.com" <devnull@localhost>
Date: Thu, 12 Jul 2007 04:39:19 +0000
Subject: Fix for bug 228190 . Remove unnecessary NSS_ENABLE_ECC declarations .
 r=nelson

---
 security/nss/cmd/bltest/manifest.mn            | 4 ----
 security/nss/cmd/certutil/manifest.mn          | 4 ----
 security/nss/cmd/fipstest/Makefile             | 4 ----
 security/nss/cmd/lib/manifest.mn               | 4 ----
 security/nss/cmd/pk12util/manifest.mn          | 4 ----
 security/nss/cmd/selfserv/manifest.mn          | 4 ----
 security/nss/cmd/tstclnt/manifest.mn           | 4 ----
 security/nss/lib/freebl/manifest.mn            | 4 ----
 security/nss/lib/softoken/legacydb/manifest.mn | 4 ----
 security/nss/lib/softoken/manifest.mn          | 4 ----
 security/nss/lib/ssl/manifest.mn               | 4 ----
 11 files changed, 44 deletions(-)

(limited to 'security/nss')

diff --git a/security/nss/cmd/bltest/manifest.mn b/security/nss/cmd/bltest/manifest.mn
index 1fd6325a7..3c283af6d 100644
--- a/security/nss/cmd/bltest/manifest.mn
+++ b/security/nss/cmd/bltest/manifest.mn
@@ -56,7 +56,3 @@ CSRCS = \
 	blapitest.c \
 	$(NULL)
 
-ifdef NSS_ENABLE_ECC
-DEFINES += -DNSS_ENABLE_ECC
-endif
-
diff --git a/security/nss/cmd/certutil/manifest.mn b/security/nss/cmd/certutil/manifest.mn
index 7ad2b2814..d8c755dc1 100644
--- a/security/nss/cmd/certutil/manifest.mn
+++ b/security/nss/cmd/certutil/manifest.mn
@@ -54,8 +54,4 @@ REQUIRES = dbm seccmd
 
 PROGRAM = certutil
 
-ifdef NSS_ENABLE_ECC
-DEFINES += -DNSS_ENABLE_ECC
-endif
-
 #USE_STATIC_LIBS = 1
diff --git a/security/nss/cmd/fipstest/Makefile b/security/nss/cmd/fipstest/Makefile
index 3b8ea808a..a54a124ed 100755
--- a/security/nss/cmd/fipstest/Makefile
+++ b/security/nss/cmd/fipstest/Makefile
@@ -62,10 +62,6 @@ include $(CORE_DEPTH)/coreconf/config.mk
 
 include ../platlibs.mk
 
-ifdef NSS_ENABLE_ECC
-DEFINES += -DNSS_ENABLE_ECC
-endif
-
 #######################################################################
 # (5) Execute "global" rules. (OPTIONAL)                              #
 #######################################################################
diff --git a/security/nss/cmd/lib/manifest.mn b/security/nss/cmd/lib/manifest.mn
index d9829c977..ee4a29c10 100644
--- a/security/nss/cmd/lib/manifest.mn
+++ b/security/nss/cmd/lib/manifest.mn
@@ -60,8 +60,4 @@ CSRCS		= secutil.c \
 
 REQUIRES	= dbm
 
-ifdef NSS_ENABLE_ECC
-DEFINES += -DNSS_ENABLE_ECC
-endif
-
 NO_MD_RELEASE	= 1
diff --git a/security/nss/cmd/pk12util/manifest.mn b/security/nss/cmd/pk12util/manifest.mn
index d41533246..4971d7bcf 100644
--- a/security/nss/cmd/pk12util/manifest.mn
+++ b/security/nss/cmd/pk12util/manifest.mn
@@ -52,8 +52,4 @@ REQUIRES = dbm seccmd
 
 PROGRAM = pk12util
 
-ifdef NSS_ENABLE_ECC
-DEFINES += -DNSS_ENABLE_ECC
-endif
-
 # USE_STATIC_LIBS = 1
diff --git a/security/nss/cmd/selfserv/manifest.mn b/security/nss/cmd/selfserv/manifest.mn
index 1ee820980..f1f1516f3 100644
--- a/security/nss/cmd/selfserv/manifest.mn
+++ b/security/nss/cmd/selfserv/manifest.mn
@@ -50,7 +50,3 @@ REQUIRES = seccmd dbm
 
 PROGRAM = selfserv
 
-ifdef NSS_ENABLE_ECC
-DEFINES += -DNSS_ENABLE_ECC
-endif
-
diff --git a/security/nss/cmd/tstclnt/manifest.mn b/security/nss/cmd/tstclnt/manifest.mn
index 738ef10ba..fa3f5fe16 100644
--- a/security/nss/cmd/tstclnt/manifest.mn
+++ b/security/nss/cmd/tstclnt/manifest.mn
@@ -52,7 +52,3 @@ CSRCS	= tstclnt.c
 
 PROGRAM	= tstclnt
 
-ifdef NSS_ENABLE_ECC
-DEFINES += -DNSS_ENABLE_ECC
-endif
-
diff --git a/security/nss/lib/freebl/manifest.mn b/security/nss/lib/freebl/manifest.mn
index 34b1d7157..cbb99ddca 100644
--- a/security/nss/lib/freebl/manifest.mn
+++ b/security/nss/lib/freebl/manifest.mn
@@ -168,10 +168,6 @@ ALL_HDRS =  \
 	$(NULL)
 
 
-ifdef NSS_ENABLE_ECC
-DEFINES += -DNSS_ENABLE_ECC
-endif
-
 ifdef AES_GEN_TBL
 DEFINES += -DRIJNDAEL_GENERATE_TABLES
 else 
diff --git a/security/nss/lib/softoken/legacydb/manifest.mn b/security/nss/lib/softoken/legacydb/manifest.mn
index e62dff85c..6f2f595e7 100644
--- a/security/nss/lib/softoken/legacydb/manifest.mn
+++ b/security/nss/lib/softoken/legacydb/manifest.mn
@@ -62,7 +62,3 @@ CSRCS = \
 	pk11db.c \
 	$(NULL)
 
-ifdef NSS_ENABLE_ECC
-DEFINES += -DNSS_ENABLE_ECC
-endif
-
diff --git a/security/nss/lib/softoken/manifest.mn b/security/nss/lib/softoken/manifest.mn
index 88756f630..6ad5bdf70 100644
--- a/security/nss/lib/softoken/manifest.mn
+++ b/security/nss/lib/softoken/manifest.mn
@@ -90,10 +90,6 @@ CSRCS = \
 	tlsprf.c   \
 	$(NULL)
 
-ifdef NSS_ENABLE_ECC
-DEFINES += -DNSS_ENABLE_ECC
-endif
-
 ifdef SQLITE_UNSAFE_THREADS
 DEFINES += -DSQLITE_UNSAFE_THREADS
 endif
diff --git a/security/nss/lib/ssl/manifest.mn b/security/nss/lib/ssl/manifest.mn
index 06e2eb118..82c8a6f64 100644
--- a/security/nss/lib/ssl/manifest.mn
+++ b/security/nss/lib/ssl/manifest.mn
@@ -80,10 +80,6 @@ CSRCS = \
 	ssl3ecc.c \
 	$(NULL)
 
-ifdef NSS_ENABLE_ECC
-DEFINES += -DNSS_ENABLE_ECC
-endif
-
 LIBRARY_NAME = ssl
 LIBRARY_VERSION = 3
 
-- 
cgit v1.2.1