Bug 327188 - enable places by default, r=bryner

Makefile.in

@@ -282,6 +282,10 @@ endif
 endif
 endif
 
+ifdef MOZ_STORAGE
+tier_50_dirs += storage
+endif
+
 ifdef MOZ_XUL_APP
 ifndef BUILD_STATIC_LIBS
 tier_50_dirs += toolkit/library
@@ -296,10 +300,6 @@ ifdef NS_TRACE_MALLOC
 tier_50_dirs += tools/trace-malloc
 endif
 
-ifdef MOZ_STORAGE
-tier_50_dirs += storage
-endif
-
 ifdef MOZ_LDAP_XPCOM
 tier_50_dirs	+= directory/xpcom
 endif

configure.in

@@ -4189,6 +4189,7 @@ MOZ_NO_ACTIVEX_SUPPORT=1
 MOZ_NO_XPCOM_OBSOLETE=
 MOZ_NO_FAST_LOAD=
 MOZ_OJI=1
+MOZ_PLACES=
 MOZ_PLAINTEXT_EDITOR_ONLY=
 MOZ_PLUGINS=1
 MOZ_PREF_EXTENSIONS=1
@@ -4275,6 +4276,7 @@ browser)
   MOZ_XUL_APP=1
   MOZ_UPDATER=1
   MOZ_PHOENIX=1
+  MOZ_PLACES=1
   MOZ_APP_VERSION=$FIREFOX_VERSION
   MOZ_EXTENSIONS_DEFAULT=" cookie xml-rpc inspector gnomevfs permissions reporter"
   AC_DEFINE(MOZ_PHOENIX)
@@ -4383,6 +4385,7 @@ xulrunner)
   MOZ_ENABLE_LIBXUL=1
   MOZ_APP_VERSION=$MOZILLA_VERSION
   MOZ_JAVAXPCOM=1
+  MOZ_PLACES=1
   MOZ_EXTENSIONS_DEFAULT=" xml-rpc gnomevfs"
   AC_DEFINE(MOZ_XULRUNNER)
   ;;

db/morkreader/Makefile.in

@@ -45,7 +45,7 @@ include $(DEPTH)/config/autoconf.mk
 
 MODULE = morkreader
 LIBRARY_NAME  = morkreader_s
-MOZILLA_INTERNAL_API = 1
+LIBXUL_LIBRARY = 1
 FORCE_STATIC_LIB = 1
 EXPORT_LIBRARY = 1
 

storage/build/Makefile.in

@@ -49,7 +49,7 @@ SHORT_LIBNAME = strgcmps
 EXPORT_LIBRARY = 1
 IS_COMPONENT = 1
 MODULE_NAME = mozStorageModule
-MOZILLA_INTERNAL_API = 1
+LIBXUL_LIBRARY = 1
 
 REQUIRES = \
 	storage \

storage/src/Makefile.in

@@ -48,7 +48,7 @@ LIBRARY_NAME     = storage_s
 MODULE_NAME      = mozStorageModule
 FORCE_STATIC_LIB = 1
 GRE_MODULE       = 1
-MOZILLA_INTERNAL_API = 1
+LIBXUL_LIBRARY = 1
 
 REQUIRES = xpcom \
            string \

toolkit/library/libxul-config.mk

@@ -101,7 +101,6 @@ COMPONENT_LIBS += \
 	txmgr \
 	composer \
 	chrome \
-	mork \
 	mozfind \
 	appcomps \
 	commandlines \
@@ -113,10 +112,19 @@ COMPONENT_LIBS += \
 	autoconfig \
 	$(NULL)
 
+ifdef MOZ_PLACES
+COMPONENT_LIBS += storagecomps
+STATIC_LIBS += morkreader_s
+else
+COMPONENT_LIBS += \
+	mork \
+	tkhstory \
+	$(NULL)
+endif
+
 ifdef MOZ_XUL
 COMPONENT_LIBS += \
 	tkautocomplete \
-	tkhstory \
 	satchel \
 	pippki \
 	$(NULL)

toolkit/library/nsStaticXULComponents.cpp

@@ -151,10 +151,18 @@
 #define SYSTEMPREF_MODULES
 #endif
 
+#ifdef MOZ_PLACES
+#define PLACES_MODULES \
+    MODULE(mozStorageModule)
+#else
+#define PLACES_MODULES \
+    MODULE(nsMorkModule)                     \
+    MODULE(nsToolkitHistory)
+#endif    
+
 #ifdef MOZ_XUL
 #define XULENABLED_MODULES                   \
     MODULE(tkAutoCompleteModule)             \
-    MODULE(nsToolkitHistory)                 \
     MODULE(satchel)                          \
     MODULE(PKI)
 #else
@@ -196,11 +204,11 @@
     MODULE(nsTransactionManagerModule)       \
     MODULE(nsComposerModule)                 \
     MODULE(nsChromeModule)                   \
-    MODULE(nsMorkModule)                     \
     MODULE(nsFindComponent)                  \
     MODULE(application)                      \
     MODULE(Apprunner)                        \
     MODULE(CommandLineModule)                \
+    PLACES_MODULES                           \
     XULENABLED_MODULES                       \
     MODULE(nsToolkitCompsModule)             \
     XREMOTE_MODULES                          \