conditionally compiling new cache. r=dougt/a=gagan

netwerk/cache/Makefile.in

@@ -26,12 +26,16 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-DIRS		= \
+DIRS	= \
         public \
         memcache \
         filecache \
         mgr \
-		$(NULL)
+	$(NULL)
+
+ifdef MOZ_NEW_CACHE
+DIRS    += src
+endif
 
 include $(topsrcdir)/config/rules.mk
 

netwerk/cache/public/Makefile.in

@@ -36,7 +36,19 @@ XPIDLSRCS	= \
 		nsINetDataCacheRecord.idl     \
 	        nsINetDataDiskCache.idl       \
 		nsIStreamAsFile.idl           \
+		$(NULL)
+
+
+ifdef MOZ_NEW_CACHE
+XPIDLSRCS	+= \
+		nsICache.idl		      \
+		nsICacheEntryDescriptor.idl   \
+		nsICacheListener.idl	      \
+		nsICacheService.idl           \
+		nsICacheSession.idl           \
+		nsICacheVisitor.idl           \
 	        $(NULL)
+endif
 
 EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))