From fba1580ec4b1541d6bcf813afda10186249c1a3f Mon Sep 17 00:00:00 2001
From: "leaf%mozilla.org"
 <leaf%mozilla.org@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Sat, 5 Feb 2000 21:17:07 +0000
Subject: [PATCH] Pull nsprpub by static tag, if NSPR_CO_TAG isn't already set.
 Patch from wtc; r=leaf

git-svn-id: svn://10.0.0.236/trunk@59890 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/client.mak | 26 ++++++++++++++++++++++----
 1 file changed, 22 insertions(+), 4 deletions(-)

diff --git a/mozilla/client.mak b/mozilla/client.mak
index fbc9b623054..8db1be18f35 100644
--- a/mozilla/client.mak
+++ b/mozilla/client.mak
@@ -57,11 +57,11 @@ CVS_FLAGS=$(MOZ_CVS_FLAGS)
 # let's be explicit about CVSROOT... some windows cvs clients
 # are too stupid to correctly work without the -d option 
 !if defined(CVSROOT)
-CVSCO = cvs -d $(CVSROOT) -q $(CVS_FLAGS) co $(CVS_BRANCH) -P
-!else
-CVSCO = cvs -q $(CVS_FLAGS) co $(CVS_BRANCH) -P
+CVS_FLAGS=$(CVS_FLAGS) -d $(CVSROOT)
 !endif
 
+CVSCO = cvs -q $(CVS_FLAGS) co $(CVS_BRANCH) -P
+
 CVSCO_TAG = cvs -q co -P
 
 # Branch tags we use
@@ -86,6 +86,20 @@ CVSCO_RAPTOR = $(CVSCO)
 CVSCO_LIZARD = $(CVSCO)
 CVSCO_NETWORK = $(CVSCO)
 
+#//------------------------------------------------------------------------
+#// Figure out how to pull NSPR.
+#// If no NSPR_CO_TAG is specified, use the default static tag
+#//------------------------------------------------------------------------
+
+
+!if "$(NSPR_CO_TAG)" != ""
+NSPR_CO_FLAGS=-r $(NSPR_CO_TAG)
+!else
+NSPR_CO_FLAGS=-r NSPRPUB_20000201
+!endif
+
+CVSCO_NSPR = cvs -q $(CVS_FLAGS) co $(NSPR_CO_FLAGS) -P
+
 ## The master target
 ############################################################
 
@@ -97,7 +111,11 @@ pull_and_build_all: pull_all depend build_all
 
 pull_clobber_and_build_all: pull_all clobber_all build_all
 
-pull_all: pull_seamonkey
+pull_all: pull_nspr pull_seamonkey
+
+pull_nspr:
+      cd $(MOZ_SRC)\.
+      $(CVSCO_NSPR) mozilla/nsprpub
 
 # pull either layout only or seamonkey the browser
 pull_layout: