Resolves: #214728

Summary: Cleaning up obsolete macros in the build
Changes: eliminated macro NS_DS (Comment #3, #5, #9, #13, #15, #17)

1 files changed, 10 insertions, 20 deletions

diff --git a/nsconfig.mk b/nsconfig.mk
index 4bd705da..cb1eb7c2 100644
--- a/nsconfig.mk
+++ b/nsconfig.mk
@@ -382,8 +382,6 @@ NSCP_DISTDIR          = $(BUILD_ROOT)/../dist/$(NSOBJDIR_NAME)
 
 MAKE=gmake $(BUILDOPT) NO_JAVA=1
 
-export NSPR20=1
-
 LWDEFS = LIVEWIRE=1
 JSDEFS = JSFILE=1 JS_THREADSAFE=1
 
@@ -425,15 +423,15 @@ endif
 
 ifdef PRODUCT_IS_DIRECTORY_SERVER
   ifeq ($(SECURITY), export)
-    MCC_SERVER=-DMCC_HTTPD -DNS_EXPORT -DNET_SSL -DCLIENT_AUTH $(NSPR_DEFINES)
+    MCC_SERVER=-DNS_EXPORT $(NSPR_DEFINES)
   endif
   ifeq ($(SECURITY), domestic)
-    MCC_SERVER=-DMCC_HTTPD -DNS_DOMESTIC -DNET_SSL -DCLIENT_AUTH $(NSPR_DEFINES)
+    MCC_SERVER=$(NSPR_DEFINES)
   endif
   ifeq ($(SECURITY), none)
-    MCC_SERVER=-DMCC_HTTPD -DNS_UNSECURE $(NSPR_DEFINES)
+    MCC_SERVER=-DNS_UNSECURE $(NSPR_DEFINES)
   endif
-  DS_SERVER_DEFS = -DNS_DS
+  DS_SERVER_DEFS =
   ifeq ($(BUILD_DEBUG),full)
     MODULE_CFLAGS += -DDEBUG
   endif
@@ -444,7 +442,7 @@ ifdef PRODUCT_IS_DIRECTORY_SERVER
   endif
 endif
 
-MCC_SERVER += -DSPAPI20 -DBUILD_NUM=$(GET_BUILD_NUM)
+MCC_SERVER += -DBUILD_NUM=$(GET_BUILD_NUM)
 
 # ----------- Default Flags, may be overridden below ------------
 
@@ -534,7 +532,6 @@ ifdef OLD_AIX_LINKING
 else
 	DL_LIB =-ldl
 endif
-NSPR_DEFINES += -DNSPR20 
 RWTOOLS_VERSION = latest
 #HTTPDSO_NAME=libdsnshttpd
 PEER_ARCH=aix
@@ -650,7 +647,7 @@ DLL_LDFLAGS=-b
 NSAPI_CAPABLE=true
 VERITY_ARCH=_hp800
 USE_PTHREADS=1
-NSPR_DEFINES += -DNSPR20 -D_PR_NTHREAD -D_PR_USECPU -D_REENTRANT
+NSPR_DEFINES += -D_PR_NTHREAD -D_PR_USECPU -D_REENTRANT
 LINK_DLL=$(CCC) $(DLL_LDFLAGS) $(ARCH_CFLAGS) -o $@
 PEER_ARCH=hp
 RWTOOLS_VERSION = latest
@@ -688,7 +685,7 @@ endif
 ifeq (6.5,$(OSVERSION))
 ARCH_CFLAGS+=-DIRIX6_5 -mips3
 endif
-NSPR_DEFINES += -DNSPR20 -D_PR_NTHREAD -D_SGI_MP_SOURCE
+NSPR_DEFINES += -D_PR_NTHREAD -D_SGI_MP_SOURCE
 
 LINK_DLL=$(CCC) $(DLL_LDFLAGS) -o $@
 PEER_ARCH=irix
@@ -708,7 +705,6 @@ ARCH_CFLAGS=-Wall -DNO_DBM -DLINUX -DLINUX2_2 -DLINUX2_4 -fPIC -D_REENTRANT
 RANLIB=ranlib
 DLL_LDFLAGS=-shared
 LINK_DLL=$(CC) $(DLL_LDFLAGS) -o $@
-NSPR_DEFINES += -DNSPR20 
 NLIST=-lelf
 NSAPI_CAPABLE=true
 EXTRA_LIBS=-ldl -lcrypt -lpthread
@@ -759,7 +755,6 @@ NEED_VTASKSTUB = 1
 NO_MSOFT_OBJ=1
 BUILD_WEBPUB=no
 BUILD_IIOPLIB=no
-NSPR_DEFINES += -DNSPR20 
 PEER_ARCH=unixware
 
 export NO_INFORMIX=1
@@ -821,7 +816,6 @@ NEED_VTASKSTUB = 1
 NO_MSOFT_OBJ=1
 BUILD_WEBPUB=no
 BUILD_IIOPLIB=no
-NSPR_DEFINES += -DNSPR20
 PEER_ARCH=unixware5
 DB_VERSION=oem
 
@@ -857,7 +851,6 @@ ADM_VERSDIR = admserv35
 AUTOCATALOG_VERSION = oem
 BUILD_WEBPUB = no
 NO_MSOFT_OBJ = 1
-NSPR_DEFINES += -DNSPR20 
 PEER_ARCH=sco
 
 else
@@ -916,7 +909,6 @@ AUTOCATALOG_VERSION = oem
 BUILD_WEBPUB    = no
 BUILD_IIOPLIB   = no
 DL_LIB          =-ldl
-NSPR_DEFINES    += -DNSPR20 
 # svr4-x86 compatible
 PEER_ARCH=unixware
 
@@ -1037,7 +1029,6 @@ DO_PKGAUTOCATALOG=yes
 
 #this is no longer needed
 #NEED_NSPR_MALLOC=yes
-NSPR_DEFINES += -DNSPR20 
 
 PEER_ARCH=reliantunix
 RWTOOLS_VERSION = latest
@@ -1073,7 +1064,6 @@ else
 #EXTRA_LIBS=-lcxxstd -lcxx
 endif
 USE_PTHREADS=1
-NSPR_DEFINES += -DNSPR20 
 RWTOOLS_VERSION = latest
 PEER_ARCH=osf
 PEERDIR=$(DEVROOT)/osf/dev
@@ -1156,7 +1146,7 @@ NONSHARED_FLAG=-static
 NSAPI_CAPABLE=true
 NLIST=-lelf
 VERITY_ARCH=_solaris
-NSPR_DEFINES += -DNSPR20 -D_PR_NTHREAD -D_REENTRANT
+NSPR_DEFINES += -D_PR_NTHREAD -D_REENTRANT
 PEER_ARCH=solaris
 ifndef NS_USE_NATIVE
 NSPR_DEFINES += -DSOLARIS_GCC
@@ -1200,7 +1190,7 @@ NLIST=-lelf
 NO_MSOFT_OBJ=1
 BUILD_WEBPUB=no
 BUILD_IIOPLIB=no
-NSPR_DEFINES += -DNSPR20 -D_PR_NTHREAD -D_REENTRANT
+NSPR_DEFINES += -D_PR_NTHREAD -D_REENTRANT
 export NO_INFORMIX=1
 export NO_ORACLE=1
 export NO_SYBASE=1
@@ -1269,7 +1259,7 @@ DLL_LDFLAGS=
 NONSHARED_FLAG=
 NSAPI_CAPABLE=true
 NO_MSOFT_OBJ=1
-NSPR_DEFINES += -DNSPR20 -D_PR_NTHREAD -D_PR_USECPU
+NSPR_DEFINES += -D_PR_NTHREAD -D_PR_USECPU
 
 else