bug 382187 - use places for SeaMonkey history, step 1: build and use places backend with --enable-places, r=luser sr=Neil

configure.in

@@ -5797,7 +5797,9 @@ MOZ_ARG_ENABLE_BOOL(places,
     MOZ_PLACES= )
 if test -n "$MOZ_PLACES"; then
     AC_DEFINE(MOZ_PLACES)
-    MOZ_MORK=
+    if test -z "$MOZ_MAIL_NEWS"; then
+      MOZ_MORK=
+    fi
     MOZ_MORKREADER=1
 else
   if test "$MOZ_BUILD_APP" = "browser"; then

xpfe/components/Makefile.in

@@ -88,7 +88,6 @@ DIRS += \
         related \
         autocomplete \
         download-manager \
-        history \
         sidebar \
         $(NULL)
 ifndef MOZ_XUL_APP
@@ -100,6 +99,9 @@ DIRS += \
         extensions \
         $(NULL)
 endif
+ifndef MOZ_PLACES
+DIRS += history
+endif
 endif
 endif
 

xpfe/components/build/Makefile.in

@@ -96,19 +96,27 @@ endif
 
 # Suite specific includes
 ifdef MOZ_SUITE
-REQUIRES += history downloadmanager
+REQUIRES += downloadmanager
 
 SHARED_LIBRARY_LIBS += \
 	../download-manager/src/$(LIB_PREFIX)downloadmanager_s.$(LIB_SUFFIX) \
-	../history/src/$(LIB_PREFIX)history_s.$(LIB_SUFFIX) \
 	../related/src/$(LIB_PREFIX)related_s.$(LIB_SUFFIX) \
 	$(NULL)
 LOCAL_INCLUDES += \
 	-I$(srcdir)/../download-manager/src \
-	-I$(srcdir)/../history/src       \
 	-I$(srcdir)/../related/src       \
 	$(NULL)
 
+ifndef MOZ_PLACES
+REQUIRES += history
+SHARED_LIBRARY_LIBS += \
+	../history/src/$(LIB_PREFIX)history_s.$(LIB_SUFFIX) \
+	$(NULL)
+LOCAL_INCLUDES += \
+	-I$(srcdir)/../history/src       \
+	$(NULL)
+endif
+
 ifeq ($(OS_ARCH),WINNT)
 SHARED_LIBRARY_LIBS += \
 	../winhooks/$(LIB_PREFIX)winhooks_s.$(LIB_SUFFIX) \

xpfe/components/build/nsModule.cpp

@@ -47,11 +47,14 @@
 
 #ifdef MOZ_SUITE
 #include "nsRelatedLinksHandlerImpl.h"
-#include "nsGlobalHistory.h"
 #include "nsDocShellCID.h"
 #include "nsDownloadManager.h"
 #include "nsDownloadProxy.h"
 
+#if !defined(MOZ_PLACES)
+#include "nsGlobalHistory.h"
+#endif
+
 #if defined(XP_WIN)
 #include "nsWindowsHooks.h"
 #endif // Windows
@@ -65,12 +68,14 @@
 #include "nsCURILoader.h"
 #include "nsXPFEComponentsCID.h"
 
+#if !defined(MOZ_PLACES)
 // {9491C382-E3C4-11D2-BDBE-0050040A9B44}
 #define NS_GLOBALHISTORY_CID \
 { 0x9491c382, 0xe3c4, 0x11d2, { 0xbd, 0xbe, 0x0, 0x50, 0x4, 0xa, 0x9b, 0x44} }
 
 #define NS_GLOBALHISTORY_DATASOURCE_CONTRACTID \
     "@mozilla.org/rdf/datasource;1?name=history"
+#endif
 
 #ifdef MOZ_RDF
 // Factory constructors
@@ -85,10 +90,13 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsBrowserInstance)
 
 #ifdef MOZ_SUITE
 NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(RelatedLinksHandlerImpl, Init)
-NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsGlobalHistory, Init)
 NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsDownloadManager, Init)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsDownloadProxy)
 
+#if !defined(MOZ_PLACES)
+NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsGlobalHistory, Init)
+#endif
+
 #if defined(XP_WIN)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsWindowsHooks)
 #endif // Windows
@@ -150,14 +158,17 @@ static const nsModuleComponentInfo components[] = {
       nsDownloadManagerConstructor },
     { "Download", NS_DOWNLOAD_CID, NS_TRANSFER_CONTRACTID,
       nsDownloadProxyConstructor },
+    { "Related Links Handler", NS_RELATEDLINKSHANDLER_CID, NS_RELATEDLINKSHANDLER_CONTRACTID,
+       RelatedLinksHandlerImplConstructor},
+
+#if !defined(MOZ_PLACES)
     { "Global History", NS_GLOBALHISTORY_CID, NS_GLOBALHISTORY2_CONTRACTID,
       nsGlobalHistoryConstructor },
     { "Global History", NS_GLOBALHISTORY_CID, NS_GLOBALHISTORY_DATASOURCE_CONTRACTID,
       nsGlobalHistoryConstructor },
     { "Global History", NS_GLOBALHISTORY_CID, NS_GLOBALHISTORY_AUTOCOMPLETE_CONTRACTID,
       nsGlobalHistoryConstructor },
-    { "Related Links Handler", NS_RELATEDLINKSHANDLER_CID, NS_RELATEDLINKSHANDLER_CONTRACTID,
-       RelatedLinksHandlerImplConstructor},
+#endif
 
 #ifdef XP_WIN
     { NS_IWINDOWSHOOKS_CLASSNAME, NS_IWINDOWSHOOKS_CID,