From 2f3f7cea389ff9f3619939e7a3df577481a291e4 Mon Sep 17 00:00:00 2001
From: "dp%netscape.com" <dp%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Tue, 12 Jan 1999 08:07:19 +0000
Subject: [PATCH] Eliminating NU_CACHE build dependency if NO_NU_CACHE is
 defined

git-svn-id: svn://10.0.0.236/trunk@17568 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/modules/plugin/base/src/makefile.win | 8 +++++++-
 mozilla/modules/plugin/nglsrc/makefile.win   | 8 +++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/mozilla/modules/plugin/base/src/makefile.win b/mozilla/modules/plugin/base/src/makefile.win
index 0ac0e3e6a87..ea7ad3cb2c9 100644
--- a/mozilla/modules/plugin/base/src/makefile.win
+++ b/mozilla/modules/plugin/base/src/makefile.win
@@ -61,12 +61,18 @@ LCFLAGS = \
         -D_IMPL_NS_PLUGIN \
         $(NULL)
 
+!ifdef NU_CACHE
+CACHELIBNAME=cache.lib
+!else
+CACHELIBNAME=netcache.lib
+!endif
+
 OURLIBS = \
  $(DIST)\lib\xpcom32.lib \
  $(DIST)\lib\raptorbase.lib	\
  $(DIST)\lib\libplc21.lib \
  $(DIST)\lib\netlib.lib	\
- $(DIST)\lib\cache.lib \
+ $(DIST)\lib\$(CACHELIBNAME) \
  $(DIST)\lib\xppref32.lib \
  $(DIST)\lib\dbm32.lib \
  $(LIBNSPR)  
diff --git a/mozilla/modules/plugin/nglsrc/makefile.win b/mozilla/modules/plugin/nglsrc/makefile.win
index 0ac0e3e6a87..ea7ad3cb2c9 100644
--- a/mozilla/modules/plugin/nglsrc/makefile.win
+++ b/mozilla/modules/plugin/nglsrc/makefile.win
@@ -61,12 +61,18 @@ LCFLAGS = \
         -D_IMPL_NS_PLUGIN \
         $(NULL)
 
+!ifdef NU_CACHE
+CACHELIBNAME=cache.lib
+!else
+CACHELIBNAME=netcache.lib
+!endif
+
 OURLIBS = \
  $(DIST)\lib\xpcom32.lib \
  $(DIST)\lib\raptorbase.lib	\
  $(DIST)\lib\libplc21.lib \
  $(DIST)\lib\netlib.lib	\
- $(DIST)\lib\cache.lib \
+ $(DIST)\lib\$(CACHELIBNAME) \
  $(DIST)\lib\xppref32.lib \
  $(DIST)\lib\dbm32.lib \
  $(LIBNSPR)