more turning-off-places bustage fixes

configure.in

@@ -4272,6 +4272,8 @@ browser)
   MOZ_UPDATER=1
   MOZ_PHOENIX=1
   MOZ_PLACES=
+  # always enabled for form history
+  MOZ_MORKREADER=1
   MOZ_SAFE_BROWSING=1
   MOZ_APP_VERSION=$FIREFOX_VERSION
   MOZ_NO_XPCOM_OBSOLETE=1

toolkit/components/satchel/src/Makefile.in

@@ -74,13 +74,8 @@ REQUIRES =	\
 CPPSRCS = nsFormFillController.cpp \
           $(NULL)
 
-ifdef MOZ_PLACES
 REQUIRES += storage morkreader
 CPPSRCS += nsStorageFormHistory.cpp
-else
-REQUIRES += mork
-CPPSRCS += nsFormHistory.cpp
-endif
 
 LOCAL_INCLUDES = \
 	-I$(srcdir)/../../passwordmgr/base \
@@ -95,6 +90,8 @@ EXTRA_DSO_LIBS	= gkgfx
 
 include $(topsrcdir)/config/rules.mk
 
+DEFINES += -DMOZ_STORAGE_SATCHEL
+
 EXTRA_DSO_LDOPTS += \
 	$(LIBS_DIR) \
 	$(EXTRA_DSO_LIBS) \

toolkit/components/satchel/src/nsFormFillController.cpp

@@ -39,7 +39,7 @@
 
 #include "nsFormFillController.h"
 
-#ifdef MOZ_PLACES
+#ifdef MOZ_STORAGE_SATCHEL
 #include "nsStorageFormHistory.h"
 #include "nsIAutoCompleteSimpleResult.h"
 #else
@@ -494,7 +494,7 @@ nsFormFillController::StartSearch(const nsAString &aSearchString, const nsAStrin
 {
   nsCOMPtr<nsIAutoCompleteResult> result;
 
-#ifdef MOZ_PLACES
+#ifdef MOZ_STORAGE_SATCHEL
   // This assumes that FormHistory uses nsIAutoCompleteSimpleResult,
   // while PasswordManager does not.
   nsCOMPtr<nsIAutoCompleteSimpleResult> historyResult;
@@ -1121,7 +1121,7 @@ NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsFormHistory, Init)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsFormFillController)
 NS_GENERIC_FACTORY_SINGLETON_CONSTRUCTOR(nsPasswordManager, nsPasswordManager::GetInstance)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsSingleSignonPrompt)
-#if defined(MOZ_PLACES) && defined(MOZ_MORKREADER)
+#if defined(MOZ_STORAGE_SATCHEL) && defined(MOZ_MORKREADER)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsFormHistoryImporter)
 #endif
 
@@ -1166,7 +1166,7 @@ static const nsModuleComponentInfo components[] =
     NS_FORMHISTORYAUTOCOMPLETE_CONTRACTID,
     nsFormFillControllerConstructor },
 
-#if defined(MOZ_PLACES) && defined(MOZ_MORKREADER)
+#if defined(MOZ_STORAGE_SATCHEL) && defined(MOZ_MORKREADER)
   { "Form History Importer",
     NS_FORMHISTORYIMPORTER_CID,
     NS_FORMHISTORYIMPORTER_CONTRACTID,

toolkit/library/nsStaticXULComponents.cpp

@@ -234,9 +234,14 @@
 #define FILEVIEW_MODULE
 #endif
 
+#ifdef MOZ_STORAGE
+#define STORAGE_MODULE MODULE(mozStorageModule)
+#else
+#define STORAGE_MODULE
+#endif
+
 #ifdef MOZ_PLACES
 #define PLACES_MODULES \
-    MODULE(mozStorageModule)                 \
     MODULE(nsPlacesModule)
 #else
 #if (defined(MOZ_MORK) && defined(MOZ_XUL))
@@ -303,6 +308,7 @@
     MODULE(Apprunner)                        \
     MODULE(CommandLineModule)                \
     FILEVIEW_MODULE                          \
+    STORAGE_MODULE                           \
     PLACES_MODULES                           \
     XULENABLED_MODULES                       \
     MODULE(nsToolkitCompsModule)             \