Commit 12c543dc authored by cltbld%netscape.com's avatar cltbld%netscape.com
Browse files

Backing out wtc's nspr changes to clear up thread hanging & orangeness in linux build. r=alecf,don

parent 05cc8290

build/mac/NGLayoutBuildList.pm

+1 −1
Original line number Diff line number Diff line
@@ -197,7 +197,7 @@ sub Checkout() 
	# activate MacCVS

	ActivateApplication('Mcvs');



	my($nsprpub_tag) = "NSPRPUB_4_0_BETA_20000215";

	my($nsprpub_tag) = "NSPRPUB_20000208";

	

	#//

	#// Checkout commands

client.mak

+1 −1
Original line number Diff line number Diff line
@@ -95,7 +95,7 @@ CVSCO_NETWORK = $(CVSCO) 
!if "$(NSPR_CO_TAG)" != ""

NSPR_CO_FLAGS=-r $(NSPR_CO_TAG)

!else

NSPR_CO_FLAGS=-r NSPRPUB_4_0_BETA_20000215

NSPR_CO_FLAGS=-r NSPRPUB_20000201

!endif



CVSCO_NSPR = cvs -q $(CVS_FLAGS) co $(NSPR_CO_FLAGS) -P

client.mk

+1 −1
Original line number Diff line number Diff line
@@ -152,7 +152,7 @@ endif 
NSPR_CO_MODULE        = mozilla/nsprpub

NSPR_CO_FLAGS := -P

CVSCO_NSPR    = cvs $(CVS_FLAGS) co $(NSPR_CO_FLAGS)

NSPR_CO_TAG   = NSPRPUB_4_0_BETA_20000215

NSPR_CO_TAG   = NSPRPUB_20000201



ifdef NSPR_CO_TAG

  NSPR_CO_FLAGS := $(NSPR_CO_FLAGS) -r $(NSPR_CO_TAG)

config/config.mak

+1 −1
Original line number Diff line number Diff line
@@ -347,7 +347,7 @@ MKCPYFLAGS= -i 
#// Common Libraries

#//

#//------------------------------------------------------------------------

NSPR_VERSION=4

NSPR_VERSION=3

LIBNSPR=$(DIST)\lib\nspr$(NSPR_VERSION).lib $(DIST)\lib\plds$(NSPR_VERSION).lib $(DIST)\lib\plc$(NSPR_VERSION).lib

LIBPLC=$(DIST)\lib\plc$(NSPR_VERSION).lib

configure

+1 −1
Original line number Diff line number Diff line
@@ -819,7 +819,7 @@ _SUBDIR_CONFIG_ARGS="$ac_configure_args" 


MOZJPEG=62

MOZPNG=10002

NSPR_VERSION=4

NSPR_VERSION=3



GTK_VERSION=1.2.0

LIBIDL_VERSION=0.6.3