Resolves: #214728

Summary: Cleaning up obsolete macros in the build
Changes: eliminated macro NSPR20 (Comment #9)

32 files changed, 1 insertions, 33 deletions

diff --git a/ldap/servers/Makefile b/ldap/servers/Makefile
index 4d95b498..3ec9bf18 100644
--- a/ldap/servers/Makefile
+++ b/ldap/servers/Makefile
@@ -45,7 +45,6 @@ LDAP_SRC = ../
 
 NOSTDCLEAN=true # don't let nsconfig.mk define target clean
 NOSTDSTRIP=true # don't let nsconfig.mk define target strip
-NSPR20=true	# probably should be defined somewhere else (not sure where)
 
 include $(BUILD_ROOT)/nsdefs.mk
 include $(BUILD_ROOT)/nsconfig.mk
diff --git a/ldap/servers/plugins/Makefile b/ldap/servers/plugins/Makefile
index 64854009..f8d6c297 100644
--- a/ldap/servers/plugins/Makefile
+++ b/ldap/servers/plugins/Makefile
@@ -46,7 +46,6 @@ LDAP_SRC = $(BUILD_ROOT)/ldap
 
 NOSTDCLEAN=true # don't let nsconfig.mk define target clean
 NOSTDSTRIP=true # don't let nsconfig.mk define target strip
-NSPR20=true	# probably should be defined somewhere else (not sure where)
 
 include $(BUILD_ROOT)/nsconfig.mk
 include $(LDAP_SRC)/nsldap.mk
diff --git a/ldap/servers/plugins/acl/Makefile b/ldap/servers/plugins/acl/Makefile
index 7e41bf63..53204e5e 100644
--- a/ldap/servers/plugins/acl/Makefile
+++ b/ldap/servers/plugins/acl/Makefile
@@ -46,7 +46,6 @@ BUILD_ROOT = ../../../..
 
 NOSTDCLEAN=true # don't let nsconfig.mk define target clean
 NOSTDSTRIP=true # don't let nsconfig.mk define target strip
-NSPR20=true	# probably should be defined somewhere else (not sure where)
 
 OBJDEST = $(OBJDIR)/lib/libacl
 LIBDIR = $(LDAP_PLUGIN_RELDIR)
diff --git a/ldap/servers/plugins/chainingdb/Makefile b/ldap/servers/plugins/chainingdb/Makefile
index f530dc9c..bc1ef7a0 100644
--- a/ldap/servers/plugins/chainingdb/Makefile
+++ b/ldap/servers/plugins/chainingdb/Makefile
@@ -47,7 +47,6 @@ BUILD_ROOT = ../../../..
 
 NOSTDCLEAN=true # don't let nsconfig.mk define target clean
 NOSTDSTRIP=true # don't let nsconfig.mk define target strip
-NSPR20=true	# probably should be defined somewhere else (not sure where)
 
 OBJDEST = $(OBJDIR)/lib/libcb
 LIBDIR = $(LDAP_PLUGIN_RELDIR)
diff --git a/ldap/servers/plugins/collation/Makefile b/ldap/servers/plugins/collation/Makefile
index b3d52860..ab48c047 100644
--- a/ldap/servers/plugins/collation/Makefile
+++ b/ldap/servers/plugins/collation/Makefile
@@ -42,7 +42,6 @@ BUILD_ROOT= ../../../..
 
 NOSTDCLEAN=true # don't let nsconfig.mk define target clean
 NOSTDSTRIP=true # don't let nsconfig.mk define target strip
-NSPR20=true	# probably should be defined somewhere else (not sure where)
 
 OBJDEST= $(OBJDIR)/lib/libcollation-plugin
 LIBDIR = $(LDAP_PLUGIN_RELDIR)
diff --git a/ldap/servers/plugins/cos/Makefile b/ldap/servers/plugins/cos/Makefile
index 46f6e91b..7653d698 100644
--- a/ldap/servers/plugins/cos/Makefile
+++ b/ldap/servers/plugins/cos/Makefile
@@ -42,7 +42,6 @@ BUILD_ROOT = ../../../..
 
 NOSTDCLEAN=true # don't let nsconfig.mk define target clean
 NOSTDSTRIP=true # don't let nsconfig.mk define target strip
-NSPR20=true	# probably should be defined somewhere else (not sure where)
 
 OBJDEST = $(OBJDIR)/lib/libcos
 LIBDIR = $(LDAP_PLUGIN_RELDIR)
diff --git a/ldap/servers/plugins/distrib/Makefile b/ldap/servers/plugins/distrib/Makefile
index 1f90b39c..4dd83674 100644
--- a/ldap/servers/plugins/distrib/Makefile
+++ b/ldap/servers/plugins/distrib/Makefile
@@ -45,7 +45,6 @@ BUILD_ROOT = ../../../..
 
 NOSTDCLEAN=true # don't let nsconfig.mk define target clean
 NOSTDSTRIP=true # don't let nsconfig.mk define target strip
-NSPR20=true	# probably should be defined somewhere else (not sure where)
 
 OBJDEST = $(OBJDIR)/lib/libdistrib
 LIBDIR = $(LDAP_PLUGIN_RELDIR)
diff --git a/ldap/servers/plugins/http/Makefile b/ldap/servers/plugins/http/Makefile
index 2fbd92f4..654cf421 100644
--- a/ldap/servers/plugins/http/Makefile
+++ b/ldap/servers/plugins/http/Makefile
@@ -41,7 +41,6 @@ BUILD_ROOT = ../../../..
 
 NOSTDCLEAN=true # don't let nsconfig.mk define target clean
 NOSTDSTRIP=true # don't let nsconfig.mk define target strip
-NSPR20=true	# probably should be defined somewhere else (not sure where)
 
 OBJDEST = $(OBJDIR)/lib/libhttpclient
 LIBDIR = $(LDAP_PLUGIN_RELDIR)
diff --git a/ldap/servers/plugins/pam_passthru/Makefile b/ldap/servers/plugins/pam_passthru/Makefile
index 61c02319..ff846c8a 100644
--- a/ldap/servers/plugins/pam_passthru/Makefile
+++ b/ldap/servers/plugins/pam_passthru/Makefile
@@ -46,7 +46,6 @@ BUILD_ROOT = ../../../..
 
 NOSTDCLEAN=true # don't let nsconfig.mk define target clean
 NOSTDSTRIP=true # don't let nsconfig.mk define target strip
-NSPR20=true	# probably should be defined somewhere else (not sure where)
 
 OBJDEST = $(OBJDIR)/lib/libpam_passthru
 LIBDIR = $(LDAP_PLUGIN_RELDIR)
diff --git a/ldap/servers/plugins/passthru/Makefile b/ldap/servers/plugins/passthru/Makefile
index ca3c1cd2..2ff72a2e 100644
--- a/ldap/servers/plugins/passthru/Makefile
+++ b/ldap/servers/plugins/passthru/Makefile
@@ -47,7 +47,6 @@ BUILD_ROOT = ../../../..
 
 NOSTDCLEAN=true # don't let nsconfig.mk define target clean
 NOSTDSTRIP=true # don't let nsconfig.mk define target strip
-NSPR20=true	# probably should be defined somewhere else (not sure where)
 
 OBJDEST = $(OBJDIR)/lib/libpassthru
 LIBDIR = $(LDAP_PLUGIN_RELDIR)
diff --git a/ldap/servers/plugins/presence/Makefile b/ldap/servers/plugins/presence/Makefile
index 4ba24c6d..477e285f 100644
--- a/ldap/servers/plugins/presence/Makefile
+++ b/ldap/servers/plugins/presence/Makefile
@@ -42,7 +42,6 @@ BUILD_ROOT = ../../../..
 
 NOSTDCLEAN=true # don't let nsconfig.mk define target clean
 NOSTDSTRIP=true # don't let nsconfig.mk define target strip
-NSPR20=true	# probably should be defined somewhere else (not sure where)
 
 OBJDEST = $(OBJDIR)/lib/libpresence
 LIBDIR = $(LDAP_PLUGIN_RELDIR)
diff --git a/ldap/servers/plugins/pwdstorage/Makefile b/ldap/servers/plugins/pwdstorage/Makefile
index a53ebc92..4ff2aff7 100644
--- a/ldap/servers/plugins/pwdstorage/Makefile
+++ b/ldap/servers/plugins/pwdstorage/Makefile
@@ -46,7 +46,6 @@ BUILD_ROOT = ../../../..
 
 NOSTDCLEAN=true # don't let nsconfig.mk define target clean
 NOSTDSTRIP=true # don't let nsconfig.mk define target strip
-NSPR20=true	# probably should be defined somewhere else (not sure where)
 
 OBJDEST = $(OBJDIR)/lib/libpwdstorage
 LIBDIR = $(LDAP_PLUGIN_RELDIR)
diff --git a/ldap/servers/plugins/referint/Makefile b/ldap/servers/plugins/referint/Makefile
index 8f7c4da2..b6de7d15 100644
--- a/ldap/servers/plugins/referint/Makefile
+++ b/ldap/servers/plugins/referint/Makefile
@@ -42,7 +42,6 @@ BUILD_ROOT = ../../../..
 
 NOSTDCLEAN=true # don't let nsconfig.mk define target clean
 NOSTDSTRIP=true # don't let nsconfig.mk define target strip
-NSPR20=true	# probably should be defined somewhere else (not sure where)
 
 OBJDEST = $(OBJDIR)/lib/referint-plugin
 LIBDIR = $(LDAP_PLUGIN_RELDIR)
diff --git a/ldap/servers/plugins/replication/Makefile b/ldap/servers/plugins/replication/Makefile
index edee273c..a348bed8 100644
--- a/ldap/servers/plugins/replication/Makefile
+++ b/ldap/servers/plugins/replication/Makefile
@@ -47,7 +47,6 @@ BUILD_ROOT = ../../../..
 
 NOSTDCLEAN=true # don't let nsconfig.mk define target clean
 NOSTDSTRIP=true # don't let nsconfig.mk define target strip
-NSPR20=true	# probably should be defined somewhere else (not sure where)
 
 OBJDEST = $(OBJDIR)/lib/replication-plugin
 LIBDIR = $(LDAP_PLUGIN_RELDIR)
diff --git a/ldap/servers/plugins/retrocl/Makefile b/ldap/servers/plugins/retrocl/Makefile
index fcfb0728..3dd33d49 100644
--- a/ldap/servers/plugins/retrocl/Makefile
+++ b/ldap/servers/plugins/retrocl/Makefile
@@ -45,7 +45,6 @@ BUILD_ROOT = ../../../..
 
 NOSTDCLEAN=true # don't let nsconfig.mk define target clean
 NOSTDSTRIP=true # don't let nsconfig.mk define target strip
-NSPR20=true	# probably should be defined somewhere else (not sure where)
 
 OBJDEST = $(OBJDIR)/lib/retrocl-plugin
 BINDIR = $(LDAP_SERVER_RELDIR)
diff --git a/ldap/servers/plugins/rever/Makefile b/ldap/servers/plugins/rever/Makefile
index 8bb369d8..a271a522 100644
--- a/ldap/servers/plugins/rever/Makefile
+++ b/ldap/servers/plugins/rever/Makefile
@@ -46,7 +46,6 @@ BUILD_ROOT = ../../../..
 
 NOSTDCLEAN=true # don't let nsconfig.mk define target clean
 NOSTDSTRIP=true # don't let nsconfig.mk define target strip
-NSPR20=true	# probably should be defined somewhere else (not sure where)
 
 OBJDEST = $(OBJDIR)/lib/libdes
 LIBDIR = $(LDAP_PLUGIN_RELDIR)
diff --git a/ldap/servers/plugins/roles/Makefile b/ldap/servers/plugins/roles/Makefile
index 7c616ddd..47cc2d39 100644
--- a/ldap/servers/plugins/roles/Makefile
+++ b/ldap/servers/plugins/roles/Makefile
@@ -42,7 +42,6 @@ BUILD_ROOT = ../../../..
 
 NOSTDCLEAN=true # don't let nsconfig.mk define target clean
 NOSTDSTRIP=true # don't let nsconfig.mk define target strip
-NSPR20=true	# probably should be defined somewhere else (not sure where)
 
 OBJDEST = $(OBJDIR)/lib/libroles
 LIBDIR = $(LDAP_PLUGIN_RELDIR)
diff --git a/ldap/servers/plugins/shared/Makefile b/ldap/servers/plugins/shared/Makefile
index dbb5f03b..17c28cba 100644
--- a/ldap/servers/plugins/shared/Makefile
+++ b/ldap/servers/plugins/shared/Makefile
@@ -49,10 +49,9 @@ SHARED=shared
 
 NOSTDCLEAN=true # don't let nsconfig.mk define target clean
 NOSTDSTRIP=true # don't let nsconfig.mk define target strip
-#NSPR20=true	# probably should be defined somewhere else (not sure where)
 
 OBJDEST = $(OBJDIR)/lib/$(SHARED)
-LIBDIR = $(LDAP_LIBDIR)
+LIBDIR = $(LDAP_PLUGIN_RELDIR)
 
 include $(BUILD_ROOT)/nsdefs.mk
 include $(BUILD_ROOT)/nsconfig.mk
diff --git a/ldap/servers/plugins/statechange/Makefile b/ldap/servers/plugins/statechange/Makefile
index 59bf9df5..4ef63a95 100644
--- a/ldap/servers/plugins/statechange/Makefile
+++ b/ldap/servers/plugins/statechange/Makefile
@@ -42,7 +42,6 @@ BUILD_ROOT = ../../../..
 
 NOSTDCLEAN=true # don't let nsconfig.mk define target clean
 NOSTDSTRIP=true # don't let nsconfig.mk define target strip
-NSPR20=true	# probably should be defined somewhere else (not sure where)
 
 OBJDEST = $(OBJDIR)/lib/libstatechange
 LIBDIR = $(LDAP_PLUGIN_RELDIR)
diff --git a/ldap/servers/plugins/syntaxes/Makefile b/ldap/servers/plugins/syntaxes/Makefile
index 76fbbc1a..507d8f35 100644
--- a/ldap/servers/plugins/syntaxes/Makefile
+++ b/ldap/servers/plugins/syntaxes/Makefile
@@ -46,7 +46,6 @@ BUILD_ROOT = ../../../..
 
 NOSTDCLEAN=true # don't let nsconfig.mk define target clean
 NOSTDSTRIP=true # don't let nsconfig.mk define target strip
-NSPR20=true	# probably should be defined somewhere else (not sure where)
 
 OBJDEST = $(OBJDIR)/lib/libsyntax
 LIBDIR = $(LDAP_PLUGIN_RELDIR)
diff --git a/ldap/servers/plugins/uiduniq/Makefile b/ldap/servers/plugins/uiduniq/Makefile
index b57d32a0..a64a40d9 100644
--- a/ldap/servers/plugins/uiduniq/Makefile
+++ b/ldap/servers/plugins/uiduniq/Makefile
@@ -47,7 +47,6 @@ BUILD_ROOT = ../../../..
 
 NOSTDCLEAN=true # don't let nsconfig.mk define target clean
 NOSTDSTRIP=true # don't let nsconfig.mk define target strip
-NSPR20=true	# probably should be defined somewhere else (not sure where)
 
 OBJDEST = $(OBJDIR)/lib/libuidunique
 LIBDIR = $(LDAP_PLUGIN_RELDIR)
diff --git a/ldap/servers/plugins/vattrsp_template/Makefile b/ldap/servers/plugins/vattrsp_template/Makefile
index 86c092ee..9ed7c0c7 100644
--- a/ldap/servers/plugins/vattrsp_template/Makefile
+++ b/ldap/servers/plugins/vattrsp_template/Makefile
@@ -42,7 +42,6 @@ BUILD_ROOT = ../../../..
 
 NOSTDCLEAN=true # don't let nsconfig.mk define target clean
 NOSTDSTRIP=true # don't let nsconfig.mk define target strip
-NSPR20=true	# probably should be defined somewhere else (not sure where)
 
 OBJDEST = $(OBJDIR)/lib/libvattrsp
 LIBDIR = $(LDAP_PLUGIN_RELDIR)
diff --git a/ldap/servers/plugins/views/Makefile b/ldap/servers/plugins/views/Makefile
index e232ef24..521b6f14 100644
--- a/ldap/servers/plugins/views/Makefile
+++ b/ldap/servers/plugins/views/Makefile
@@ -42,7 +42,6 @@ BUILD_ROOT = ../../../..
 
 NOSTDCLEAN=true # don't let nsconfig.mk define target clean
 NOSTDSTRIP=true # don't let nsconfig.mk define target strip
-NSPR20=true	# probably should be defined somewhere else (not sure where)
 
 OBJDEST = $(OBJDIR)/lib/libviews
 LIBDIR = $(LDAP_PLUGIN_RELDIR)
diff --git a/ldap/servers/slapd/Makefile b/ldap/servers/slapd/Makefile
index 8fce51f5..526350f4 100644
--- a/ldap/servers/slapd/Makefile
+++ b/ldap/servers/slapd/Makefile
@@ -46,7 +46,6 @@ BUILD_ROOT = ../../..
 
 NOSTDCLEAN=true # don't let nsconfig.mk define target clean
 NOSTDSTRIP=true # don't let nsconfig.mk define target strip
-NSPR20=true	# probably should be defined somewhere else (not sure where)
 
 OBJDEST = $(OBJDIR)/servers/obj
 BINDIR = $(LDAP_SERVER_RELDIR)
diff --git a/ldap/servers/slapd/back-ldbm/Makefile b/ldap/servers/slapd/back-ldbm/Makefile
index 6ae6c924..fa8e4927 100644
--- a/ldap/servers/slapd/back-ldbm/Makefile
+++ b/ldap/servers/slapd/back-ldbm/Makefile
@@ -45,7 +45,6 @@ BUILD_ROOT = ../../../..
 
 NOSTDCLEAN=true # don't let nsconfig.mk define target clean
 NOSTDSTRIP=true # don't let nsconfig.mk define target strip
-NSPR20=true	# probably should be defined somewhere else (not sure where)
 
 OBJDEST = $(OBJDIR)/lib/libback-ldbm
 
diff --git a/ldap/servers/slapd/back-ldif/Makefile b/ldap/servers/slapd/back-ldif/Makefile
index 3b5ea958..6b616bc6 100644
--- a/ldap/servers/slapd/back-ldif/Makefile
+++ b/ldap/servers/slapd/back-ldif/Makefile
@@ -46,7 +46,6 @@ BUILD_ROOT = ../../../..
 
 NOSTDCLEAN=true # don't let nsconfig.mk define target clean
 NOSTDSTRIP=true # don't let nsconfig.mk define target strip
-NSPR20=true	# probably should be defined somewhere else (not sure where)
 
 OBJDEST = $(OBJDIR)/lib/libback-ldif
 LIBDIR = $(LDAP_LIBDIR)
diff --git a/ldap/servers/slapd/ntmsgdll/Makefile b/ldap/servers/slapd/ntmsgdll/Makefile
index fccb9528..c152ef0f 100644
--- a/ldap/servers/slapd/ntmsgdll/Makefile
+++ b/ldap/servers/slapd/ntmsgdll/Makefile
@@ -46,7 +46,6 @@ BUILD_ROOT = ../../../..
 
 NOSTDCLEAN=true # don't let nsconfig.mk define target clean
 NOSTDSTRIP=true # don't let nsconfig.mk define target strip
-NSPR20=true	# probably should be defined somewhere else (not sure where)
 
 OBJDEST = $(OBJDIR)/ntmsgdll/obj
 BINDIR = $(LDAP_SERVER_RELDIR)
diff --git a/ldap/servers/slapd/test-plugins/Makefile b/ldap/servers/slapd/test-plugins/Makefile
index 024e2ebb..dcc3a9ab 100644
--- a/ldap/servers/slapd/test-plugins/Makefile
+++ b/ldap/servers/slapd/test-plugins/Makefile
@@ -46,7 +46,6 @@ BUILD_ROOT = ../../../..
 
 NOSTDCLEAN=true # don't let nsconfig.mk define target clean
 NOSTDSTRIP=true # don't let nsconfig.mk define target strip
-NSPR20=true     # probably should be defined somewhere else (not sure where)
 
 OBJDEST = $(OBJDIR)/servers/obj
 BINDIR = $(OBJDIR)/bin
diff --git a/ldap/servers/slapd/tools/Makefile b/ldap/servers/slapd/tools/Makefile
index fc163462..736fe03b 100644
--- a/ldap/servers/slapd/tools/Makefile
+++ b/ldap/servers/slapd/tools/Makefile
@@ -46,7 +46,6 @@ BUILD_ROOT = ../../../..
 
 NOSTDCLEAN=true # don't let nsconfig.mk define target clean
 NOSTDSTRIP=true # don't let nsconfig.mk define target strip
-NSPR20=true	# probably should be defined somewhere else (not sure where)
 
 OBJDEST = $(OBJDIR)/servers/tools/obj
 BINDIR = $(LDAP_SERVER_RELDIR)
diff --git a/ldap/servers/slapd/tools/rsearch/Makefile b/ldap/servers/slapd/tools/rsearch/Makefile
index 0fad852c..8a85af00 100644
--- a/ldap/servers/slapd/tools/rsearch/Makefile
+++ b/ldap/servers/slapd/tools/rsearch/Makefile
@@ -46,7 +46,6 @@ BUILD_ROOT = ../../../../..
 
 NOSTDCLEAN=true # don't let nsconfig.mk define target clean
 NOSTDSTRIP=true # don't let nsconfig.mk define target strip
-NSPR20=true	# probably should be defined somewhere else (not sure where)
 
 OBJDEST = $(OBJDIR)/servers/tools/obj
 BINDIR = $(RELDIR)/usr/bin
diff --git a/ldap/servers/snmp/Makefile b/ldap/servers/snmp/Makefile
index d8a1d40c..50a48c35 100644
--- a/ldap/servers/snmp/Makefile
+++ b/ldap/servers/snmp/Makefile
@@ -52,7 +52,6 @@ LDAP_SRC = ../..
 
 NOSTDCLEAN=true # don't let nsconfig.mk define target clean
 NOSTDSTRIP=true # don't let nsconfig.mk define target strip
-NSPR20=true	# probably should be defined somewhere else (not sure where)
 
 OBJDEST = $(OBJDIR)/ldap-agent
 BINDIR = $(LDAP_SERVER_RELDIR)
diff --git a/ldap/servers/snmp/ntagt/Makefile b/ldap/servers/snmp/ntagt/Makefile
index b0f50b98..501defdf 100644
--- a/ldap/servers/snmp/ntagt/Makefile
+++ b/ldap/servers/snmp/ntagt/Makefile
@@ -50,7 +50,6 @@ BINDIR      =   $(LDAP_SERVER_RELDIR)
 
 NOSTDCLEAN = true # don't let nsconfig.mk define target clean
 NOSTDSTRIP = true # don't let nsconfig.mk define target strip
-NSPR20     = true
 
 include         $(BUILD_ROOT)/nsconfig.mk
 include         $(MSRV_ROOT)/nsldap.mk