Bug 384154 layout-debug component does not build

r=benjamin

extensions/layout-debug/src/Makefile.in

@@ -47,7 +47,7 @@ LIBRARY_NAME	= gkdebug
 EXPORT_LIBRARY	= 1
 IS_COMPONENT	= 1
 MODULE_NAME	= nsLayoutDebugModule
-MOZILLA_INTERNAL_API = 1
+LIBXUL_LIBRARY = 1
 
 REQUIRES	= xpcom \
 		  string \

toolkit/library/Makefile.in

@@ -223,3 +223,7 @@ ifdef MOZ_JAVAXPCOM
 dlldeps-javaxpcom.cpp: $(topsrcdir)/extensions/java/xpcom/src/dlldeps-javaxpcom.cpp
 	$(INSTALL) $^ .
 endif
+
+ifneq (,$(filter layout-debug,$(MOZ_EXTENSIONS)))
+DEFINES += -DMOZ_ENABLE_EXTENSION_LAYOUT_DEBUG
+endif

toolkit/library/libxul-config.mk

@@ -316,6 +316,10 @@ DEFINES += -DMOZ_SPELLCHECK
 COMPONENT_LIBS += spellchecker
 endif
 
+ifneq (,$(filter layout-debug,$(MOZ_EXTENSIONS)))
+COMPONENT_LIBS += gkdebug
+endif
+
 ifdef GC_LEAK_DETECTOR
 EXTRA_DSO_LIBS += boehm
 endif

toolkit/library/nsStaticXULComponents.cpp

@@ -160,6 +160,12 @@
 #define SYSTEMPREF_MODULES
 #endif
 
+#ifdef MOZ_ENABLE_EXTENSION_LAYOUT_DEBUG
+#define LAYOUT_DEBUG_MODULE MODULE(nsLayoutDebugModule)
+#else
+#define LAYOUT_DEBUG_MODULE
+#endif
+
 #ifdef MOZ_PLUGINS
 #define PLUGINS_MODULES \
     MODULE(nsPluginModule)
@@ -293,6 +299,7 @@
     MODULE(NSS)                              \
     SYSTEMPREF_MODULES                       \
     SPELLCHECK_MODULE                        \
+    LAYOUT_DEBUG_MODULE                      \
     /* end of list */
 
 #define MODULE(_name) \