From 221f663a2deae0695a2fd4baa8263292b1eb9b20 Mon Sep 17 00:00:00 2001
From: Mark Banner <bugzilla@standard8.plus.com>
Date: Wed, 24 Sep 2008 17:54:14 +0100
Subject: [PATCH] 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 | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/toolkit/components/Makefile.in b/toolkit/components/Makefile.in
index 79a1b006b4eb..6c219fdb4096 100644
--- a/toolkit/components/Makefile.in
+++ b/toolkit/components/Makefile.in
@@ -53,11 +53,6 @@ DIRS += \
         contentprefs \
         microformats \
         places \
-        $(NULL)
-
-# These component dirs are built only for XUL apps
-
-DIRS += \
 	apppicker \
 	filepicker \
 	console \
@@ -95,18 +90,19 @@ 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