From 4d80701eed77299c614dccf174ac78af4c5b9922 Mon Sep 17 00:00:00 2001
From: "benjamin%smedbergs.us"
 <benjamin%smedbergs.us@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Tue, 3 Apr 2007 14:32:27 +0000
Subject: [PATCH] Bug 368979 - mozStorage/DOMStorage not working in XULRunner
 on the 1.8 branch, r=vlad a=dveditz

git-svn-id: svn://10.0.0.236/branches/MOZILLA_1_8_BRANCH@224075 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/toolkit/library/Makefile.in               |  5 ++++-
 mozilla/toolkit/library/nsStaticXULComponents.cpp | 10 ++++++++--
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/mozilla/toolkit/library/Makefile.in b/mozilla/toolkit/library/Makefile.in
index 0ea33a32605..443b46a7835 100644
--- a/mozilla/toolkit/library/Makefile.in
+++ b/mozilla/toolkit/library/Makefile.in
@@ -139,8 +139,11 @@ COMPONENT_LIBS += \
 	jsd \
 	$(NULL)
 
-ifdef MOZ_PLACES
+ifdef MOZ_STORAGE
 COMPONENT_LIBS += storagecomps
+endif
+
+ifdef MOZ_PLACES
 STATIC_LIBS += morkreader_s
 else
 COMPONENT_LIBS += \
diff --git a/mozilla/toolkit/library/nsStaticXULComponents.cpp b/mozilla/toolkit/library/nsStaticXULComponents.cpp
index c8f43f4eae7..d1bb52bb14e 100644
--- a/mozilla/toolkit/library/nsStaticXULComponents.cpp
+++ b/mozilla/toolkit/library/nsStaticXULComponents.cpp
@@ -151,9 +151,14 @@
 #define XREMOTE_MODULES
 #endif
 
+#ifdef MOZ_STORAGE
+#define STORAGE_MODULE MODULE(mozStorageModule)
+#else
+#define STORAGE_MODULE
+#endif
+
 #ifdef MOZ_PLACES
-#define PLACES_MODULES \
-    MODULE(mozStorageModule)
+#define PLACES_MODULES
 #else
 #define PLACES_MODULES \
     MODULE(nsMorkModule)
@@ -195,6 +200,7 @@
     MODULE(application)                      \
     MODULE(Apprunner)                        \
     MODULE(CommandLineModule)                \
+    STORAGE_MODULE                           \
     PLACES_MODULES                           \
     MODULE(nsToolkitCompsModule)             \
     XREMOTE_MODULES                          \