From 489b403aee1fa5b094bc0d5ca3a9792a4ea96277 Mon Sep 17 00:00:00 2001
From: "darin%meer.net" <darin%meer.net@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Fri, 8 Apr 2005 04:59:36 +0000
Subject: [PATCH] bug 280725 "Integrate new component in libxul" patch by
 bsmedberg, r=darin, a=asa

git-svn-id: svn://10.0.0.236/trunk@171884 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/toolkit/components/remote/Makefile.in     | 2 +-
 mozilla/toolkit/library/Makefile.in               | 4 ++++
 mozilla/toolkit/library/nsStaticXULComponents.cpp | 7 +++++++
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/mozilla/toolkit/components/remote/Makefile.in b/mozilla/toolkit/components/remote/Makefile.in
index 7de2393757d..293663d96c3 100644
--- a/mozilla/toolkit/components/remote/Makefile.in
+++ b/mozilla/toolkit/components/remote/Makefile.in
@@ -49,7 +49,7 @@ EXPORT_LIBRARY = 1
 IS_COMPONENT   = 1
 MODULE_NAME    = RemoteServiceModule
 
-MOZILLA_INTERNAL_API = 1
+LIBXUL_LIBRARY = 1
 
 REQUIRES = \
 	xpcom \
diff --git a/mozilla/toolkit/library/Makefile.in b/mozilla/toolkit/library/Makefile.in
index 19575f348b6..ffbf0ca6513 100644
--- a/mozilla/toolkit/library/Makefile.in
+++ b/mozilla/toolkit/library/Makefile.in
@@ -233,6 +233,10 @@ ifdef ACCESSIBILITY
 COMPONENT_LIBS += accessibility
 endif
 
+ifdef MOZ_ENABLE_XREMOTE
+COMPONENT_LIBS += remoteservice
+endif
+
 SHARED_LIBRARY_LIBS = \
 	$(foreach lib,$(STATIC_LIBS),$(DIST)/lib/$(LIB_PREFIX)$(lib).$(LIB_SUFFIX)) \
 	$(foreach component,$(COMPONENT_LIBS),$(DIST)/lib/components/$(LIB_PREFIX)$(component).$(LIB_SUFFIX)) \
diff --git a/mozilla/toolkit/library/nsStaticXULComponents.cpp b/mozilla/toolkit/library/nsStaticXULComponents.cpp
index f25633e905a..8faf0f40167 100644
--- a/mozilla/toolkit/library/nsStaticXULComponents.cpp
+++ b/mozilla/toolkit/library/nsStaticXULComponents.cpp
@@ -143,6 +143,12 @@
 #define ACCESS_MODULES
 #endif
 
+#ifdef MOZ_ENABLE_XREMOTE
+#define XREMOTE_MODULES MODULE(RemoteServiceModule)
+#else
+#define XREMOTE_MODULES
+#endif
+
 #define XUL_MODULES                          \
     MODULE(xpcomObsoleteModule)              \
     MODULE(xpconnect)                        \
@@ -180,6 +186,7 @@
     MODULE(application)                      \
     MODULE(CommandLineModule)                \
     MODULE(nsToolkitCompsModule)             \
+    XREMOTE_MODULES                          \
     MODULE(nsSoftwareUpdate)                 \
     MODULE(JavaScript_Debugger)              \
     /* end of list */