diff --git a/mozilla/modules/libimg/src/Makefile b/mozilla/modules/libimg/src/Makefile index 1e4830ae28e..d404e50c791 100644 --- a/mozilla/modules/libimg/src/Makefile +++ b/mozilla/modules/libimg/src/Makefile @@ -45,6 +45,10 @@ EXPORTS = PIMGCB.h PPSIMGCB.h REQUIRES = zlib nspr jpeg util img png xpcom +ifdef NU_CACHE +REQUIRES += cache +endif + LOCAL_INCLUDES = -I../png -I. -I$(DEPTH)/dist/public/zlib EXTRA_LIBS = $(DIST)/lib/libzlib.a $(DIST)/lib/libpng.a $(DIST)/lib/libnspr21.a $(dist)/lib/libjpeg.a $(DIST)/lib/libplc21.a $(DIST)/lib/libutil.a diff --git a/mozilla/modules/libimg/src/Makefile.in b/mozilla/modules/libimg/src/Makefile.in index a7bdf781a1f..5f678ba0a28 100644 --- a/mozilla/modules/libimg/src/Makefile.in +++ b/mozilla/modules/libimg/src/Makefile.in @@ -50,6 +50,10 @@ EXPORTS = PIMGCB.h PPSIMGCB.h REQUIRES = zlib nspr jpeg util img png xpcom +ifdef NU_CACHE +REQUIRES += cache +endif + LOCAL_INCLUDES = -I$(srcdir)/../png -I$(srcdir) -I$(DEPTH)/dist/public/zlib EXTRA_LIBS = $(DIST)/lib/libzlib.a $(DIST)/lib/libpng.a $(DIST)/lib/libnspr21.a $(dist)/lib/libjpeg.a $(DIST)/lib/libplc21.a $(DIST)/lib/libutil.a diff --git a/mozilla/modules/libimg/src/makefile.win b/mozilla/modules/libimg/src/makefile.win index 7ea91d52a2a..2b7fd43c46d 100644 --- a/mozilla/modules/libimg/src/makefile.win +++ b/mozilla/modules/libimg/src/makefile.win @@ -55,7 +55,7 @@ LLIBS=$(DIST)\lib\png.lib \ $(DIST)\lib\zip$(MOZ_BITS)$(VERSION_NUMBER).lib \ $(DIST)\lib\xpcom32.lib \ !ifdef NU_CACHE - $(DIST)\lib\cachelib.lib \ + $(DIST)\lib\cache.lib \ !endif $(NULL) !else diff --git a/mozilla/network/main/Makefile b/mozilla/network/main/Makefile index ac1511c1f9b..789e5672d7f 100644 --- a/mozilla/network/main/Makefile +++ b/mozilla/network/main/Makefile @@ -67,6 +67,10 @@ REQUIRES = ldapurl imap4url jtools progress nspr2 dbm util js parse lay style pr libfont netcache httpurl cnetinit security img layer netcnvts network \ mimetype ldap net +ifdef NU_CACHE +REQUIRES += cache +endif + ifdef MOZ_MAIL_NEWS REQUIRES += mailbxurl nntpurl pop3url endif diff --git a/mozilla/network/main/Makefile.in b/mozilla/network/main/Makefile.in index be7da12cb61..cfa5950717e 100644 --- a/mozilla/network/main/Makefile.in +++ b/mozilla/network/main/Makefile.in @@ -77,6 +77,10 @@ ifdef MOZ_MAIL_NEWS REQUIRES += mailbxurl nntpurl pop3url endif +ifdef NU_CACHE +REQUIRES += cache +endif + include $(topsrcdir)/config/rules.mk ifdef ENABLE_TESTS diff --git a/mozilla/network/main/makefile.win b/mozilla/network/main/makefile.win index 2f3874915b5..4d24e10eb58 100644 --- a/mozilla/network/main/makefile.win +++ b/mozilla/network/main/makefile.win @@ -106,7 +106,7 @@ LIBRARY_NAME=network EXTRA_LIBS= !ifdef NU_CACHE -REQUIRES= foo parse jtools java zlib nspr dbm util network js security mimetype ldap imap4url ldapurl net progress cachelib +REQUIRES= foo parse jtools java zlib nspr dbm util network js security mimetype ldap imap4url ldapurl net progress cache !else REQUIRES= foo parse jtools java zlib nspr dbm util network js security mimetype ldap imap4url ldapurl net progress !endif