diff --git a/config/autoconf.mk.in b/config/autoconf.mk.in
index 42d1c9411b9a..3fada6ac6b29 100644
--- a/config/autoconf.mk.in
+++ b/config/autoconf.mk.in
@@ -147,6 +147,7 @@ MOZ_SPELLCHECK = @MOZ_SPELLCHECK@
 MOZ_XPFE_COMPONENTS = @MOZ_XPFE_COMPONENTS@
 MOZ_PROFILELOCKING = @MOZ_PROFILELOCKING@
 MOZ_FEEDS = @MOZ_FEEDS@
+MOZ_TOOLKIT_SEARCH = @MOZ_TOOLKIT_SEARCH@
 MOZ_PLACES = @MOZ_PLACES@
 MOZ_PLACES_BOOKMARKS = @MOZ_PLACES_BOOKMARKS@
 MOZ_STORAGE = @MOZ_STORAGE@
diff --git a/configure.in b/configure.in
index 64c76ebafcaf..d9d1d23b96c2 100644
--- a/configure.in
+++ b/configure.in
@@ -4732,6 +4732,7 @@ MOZ_SPLASHSCREEN=
 MOZ_STORAGE=1
 MOZ_SVG=1
 MOZ_TIMELINE=
+MOZ_TOOLKIT_SEARCH=1
 MOZ_UI_LOCALE=en-US
 MOZ_UNIVERSALCHARDET=1
 MOZ_URL_CLASSIFIER=
@@ -8202,6 +8203,7 @@ AC_SUBST(LIBICONV)
 AC_SUBST(MOZ_PLACES)
 AC_SUBST(MOZ_PLACES_BOOKMARKS)
 AC_SUBST(MOZ_STORAGE)
+AC_SUBST(MOZ_TOOLKIT_SEARCH)
 AC_SUBST(MOZ_FEEDS)
 AC_SUBST(NS_PRINTING)
 AC_SUBST(MOZ_WEBGL)
diff --git a/toolkit/components/Makefile.in b/toolkit/components/Makefile.in
index d7b22ecd8818..ffb46b565ae8 100644
--- a/toolkit/components/Makefile.in
+++ b/toolkit/components/Makefile.in
@@ -98,14 +98,10 @@ PARALLEL_DIRS += \
   $(NULL)
 endif
 
-ifndef MOZ_THUNDERBIRD
-
-ifndef MOZ_SUITE
+ifdef MOZ_TOOLKIT_SEARCH
 PARALLEL_DIRS += search
 endif
 
-endif # MOZ_THUNDERBIRD
-
 ifdef MOZ_RDF
 PARALLEL_DIRS += downloads
 endif