From 86badc2b4e125b89dd4f7debcdd6892d024798e8 Mon Sep 17 00:00:00 2001 From: "briano%netscape.com" Date: Thu, 24 Sep 1998 03:51:10 +0000 Subject: [PATCH] Changes requested by wtc@netscape.com to support NSPR 3.0. --- config/config.mak | 2 -- config/config.mk | 17 ++--------------- 2 files changed, 2 insertions(+), 17 deletions(-) diff --git a/config/config.mak b/config/config.mak index de875119eb0..1fab0b011f5 100644 --- a/config/config.mak +++ b/config/config.mak @@ -284,11 +284,9 @@ MAKE_UNMANGLE=if exist unmangle.bat call unmangle.bat !if "$(MOZ_BITS)" == "16" LIBNSPR=$(DIST)\lib\nspr21.lib LIBNSPR=$(LIBNSPR) $(DIST)\lib\plds21.lib -LIBNSPR=$(LIBNSPR) $(DIST)\lib\msgc21.lib !else LIBNSPR=$(DIST)\lib\libnspr21.lib LIBNSPR=$(LIBNSPR) $(DIST)\lib\libplds21.lib -LIBNSPR=$(LIBNSPR) $(DIST)\lib\libmsgc21.lib !endif !else LIBNSPR=$(DIST)\lib\pr$(MOZ_BITS)$(VERSION_NUMBER).lib diff --git a/config/config.mk b/config/config.mk index 5ae69edcfd2..3abba7e84b8 100644 --- a/config/config.mk +++ b/config/config.mk @@ -300,27 +300,14 @@ LIBNT = $(DIST)/lib/libnt.$(LIB_SUFFIX) LIBAWT = $(DIST)/lib/libawt.$(LIB_SUFFIX) LIBMMEDIA = $(DIST)/lib/libmmedia.$(LIB_SUFFIX) -# -# NSPR 2.0 is now the default, "setenv NSPR10 1" to go back to 1.0 -# -ifndef NSPR10 NSPR20 = 1 ifndef USE_AUTOCONF NSPRDIR = nsprpub endif DEFINES += -DNSPR20 INCLUDES += -I$(DIST)/include -LIBNSPR = $(DIST)/lib/libplds21.$(LIB_SUFFIX) \ - $(DIST)/lib/libmsgc21.$(LIB_SUFFIX) \ - $(DIST)/lib/libnspr21.$(LIB_SUFFIX) -PURELIBNSPR = $(DIST)/lib/purelibplds21.$(LIB_SUFFIX) \ - $(DIST)/lib/purelibmsgc21.$(LIB_SUFFIX) \ - $(DIST)/lib/purelibnspr21.$(LIB_SUFFIX) -else -NSPRDIR = nspr -LIBNSPR = $(DIST)/lib/libnspr.$(LIB_SUFFIX) -PURELIBNSPR = $(DIST)/lib/libpurenspr.$(LIB_SUFFIX) -endif +LIBNSPR = $(DIST)/lib/libplds21.$(LIB_SUFFIX) $(DIST)/lib/libnspr21.$(LIB_SUFFIX) +PURELIBNSPR = $(DIST)/lib/purelibplds21.$(LIB_SUFFIX) $(DIST)/lib/purelibnspr21.$(LIB_SUFFIX) ifdef DBMALLOC LIBNSPR += $(DIST)/lib/libdbmalloc.$(LIB_SUFFIX)