Bug 398895 - "about:bloat should only be built if trace-refcnt logging is built" [p=xfsunoles@gmail.com (Jonathan Steele) r+sr=bzbarsky a1.9=sayrer]

netwerk/build/nsNetModule.cpp

@@ -180,7 +180,9 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsSafeAboutProtocolHandler)
 
 #ifdef NECKO_PROTOCOL_about
 // about
+#ifdef NS_BUILD_REFCNT_LOGGING
 #include "nsAboutBloat.h"
+#endif
 #include "nsAboutCache.h"
 #include "nsAboutCacheEntry.h"
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsAboutCacheEntry)
@@ -1000,11 +1002,13 @@ static const nsModuleComponentInfo gNetModuleInfo[] = {
       nsAboutBlank::Create
     },
 #ifdef NECKO_PROTOCOL_about
+#ifdef NS_BUILD_REFCNT_LOGGING
     { "about:bloat", 
       NS_ABOUT_BLOAT_MODULE_CID,
       NS_ABOUT_MODULE_CONTRACTID_PREFIX "bloat", 
       nsAboutBloat::Create
     },
+#endif
     { "about:cache", 
       NS_ABOUT_CACHE_MODULE_CID,
       NS_ABOUT_MODULE_CONTRACTID_PREFIX "cache", 

netwerk/protocol/about/src/Makefile.in

@@ -54,11 +54,14 @@ REQUIRES	= xpcom \
 CPPSRCS		= \
 		nsAboutProtocolHandler.cpp \
 		nsAboutBlank.cpp \
-		nsAboutBloat.cpp \
 		nsAboutCache.cpp \
 		nsAboutCacheEntry.cpp \
 		$(NULL)
 
+ifdef NS_BUILD_REFCNT_LOGGING
+  CPPSRCS += nsAboutBloat.cpp
+endif
+
 LOCAL_INCLUDES=-I$(srcdir)/../../../base/src
 
 # we don't want the shared lib, but we want to force the creation of a