Part of bug 360648 Thunderbird autocomplete migration, enable building of the toolkit autocomplete implementation for Thunderbird. Only affects Thunderbird. t=ted,dmose
authorMark Banner <bugzilla@standard8.plus.com>
Wed, 24 Sep 2008 17:54:14 +0100
changeset 19642 0e49b86be866203e89936260fd34fac25cf2ba01
parent 19641 5ba271f60a300d4b9bcec7a5fcdd276fccfbf71a
child 19643 2192a846d7acb1ced82d57bda35ee038ce8377eb
push idunknown
push userunknown
push dateunknown
bugs360648
milestone1.9.1b1pre
Part of bug 360648 Thunderbird autocomplete migration, enable building of the toolkit autocomplete implementation for Thunderbird. Only affects Thunderbird. t=ted,dmose
toolkit/components/Makefile.in
--- a/toolkit/components/Makefile.in
+++ b/toolkit/components/Makefile.in
@@ -48,21 +48,16 @@ include $(topsrcdir)/config/config.mk
 ifdef MOZ_ENABLE_XREMOTE
 DIRS += remote
 endif
 DIRS += \
         urlformatter \
         contentprefs \
         microformats \
         places \
-        $(NULL)
-
-# These component dirs are built only for XUL apps
-
-DIRS += \
 	apppicker \
 	filepicker \
 	console \
 	exthelper \
 	viewconfig \
 	typeaheadfind \
 	parentalcontrols \
 	$(NULL)
@@ -90,28 +85,29 @@ DIRS +=	viewsource
 endif
 
 ifndef MOZ_SUITE
 ifndef MOZ_THUNDERBIRD
 DIRS +=	search
 endif
 endif
 
-ifdef MOZ_THUNDERBIRD
-DIRS += autocomplete/public
-else
+ifdef MOZ_XUL
+DIRS += \
+	autocomplete \
+	$(NULL)
+endif
+
+ifndef MOZ_THUNDERBIRD
 DIRS +=	\
 	cookie \
 	$(NULL)
 
 ifdef MOZ_XUL
-DIRS += \
-	autocomplete \
-	satchel \
-	$(NULL)
+DIRS += satchel
 endif # MOZ_XUL
 
 ifdef MOZ_SUITE
 # Suite can't use passwordmgr because mail still depends on wallet (bug 239131)
 DIRS += passwordmgr/public
 else
 DIRS += passwordmgr
 endif # MOZ_SUITE