From 8bdfe9f67e61090b0b74c41f16a67419078512c9 Mon Sep 17 00:00:00 2001
From: "kairo%kairo.at" <kairo%kairo.at>
Date: Mon, 25 Jun 2007 11:05:03 +0000
Subject: [PATCH] bug 383833 - prepare to eliminate toolkit's mork-based
 history implementation: make places-enabled builds not descend into history/
 any more and use places' nsIBrowserHistory for them, r=mano

---
 toolkit/components/Makefile.in               | 4 +++-
 toolkit/components/places/public/Makefile.in | 1 +
 xpfe/browser/src/Makefile.in                 | 9 +++++++--
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/toolkit/components/Makefile.in b/toolkit/components/Makefile.in
index deaae320a3b..c97f5825a9a 100644
--- a/toolkit/components/Makefile.in
+++ b/toolkit/components/Makefile.in
@@ -97,11 +97,13 @@ ifndef MOZ_SUITE
 ifdef MOZ_XUL
 DIRS += \
 	autocomplete \
-	history \
 	passwordmgr \
 	satchel \
 	$(NULL)
 endif # MOZ_XUL
+ifndef MOZ_PLACES
+DIRS +=	history
+endif # MOZ_PLACES
 endif # MOZ_SUITE
 endif # MOZ_THUNDERBIRD
 
diff --git a/toolkit/components/places/public/Makefile.in b/toolkit/components/places/public/Makefile.in
index b3cd751dda6..b04bbdb37bc 100644
--- a/toolkit/components/places/public/Makefile.in
+++ b/toolkit/components/places/public/Makefile.in
@@ -48,6 +48,7 @@ XPIDL_MODULE = places
 
 XPIDLSRCS  = \
   nsIAnnotationService.idl \
+  nsIBrowserHistory.idl \
   nsIFaviconService.idl \
   nsINavHistoryService.idl \
   nsINavBookmarksService.idl \
diff --git a/xpfe/browser/src/Makefile.in b/xpfe/browser/src/Makefile.in
index b629aa70562..a300d1f8c47 100644
--- a/xpfe/browser/src/Makefile.in
+++ b/xpfe/browser/src/Makefile.in
@@ -64,11 +64,16 @@ REQUIRES	= xpcom \
 		  pref \
 		  webbrwsr \
 		  windowwatcher \
-		  history \
 		  $(NULL)
 
+ifdef MOZ_PLACES
+REQUIRES +=	  places
+else
+REQUIRES +=	  history
+endif
+
 ifneq (,$(MOZ_PHOENIX)$(MOZ_XULRUNNER))
-REQUIRES += toolkitcomps history
+REQUIRES += toolkitcomps
 endif
 
 CPPSRCS		= \