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

@@ -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
 

toolkit/components/places/public/Makefile.in

@@ -48,6 +48,7 @@ XPIDL_MODULE = places
 
 XPIDLSRCS  = \
   nsIAnnotationService.idl \
+  nsIBrowserHistory.idl \
   nsIFaviconService.idl \
   nsINavHistoryService.idl \
   nsINavBookmarksService.idl \

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		= \