Bug 547653 - Build toolkit search based on a define rather than an exclusion of some apps, r=ted

--HG--
extra : rebase_source : b164bf687e7926a81ae8b25823858f11565a947c
This commit is contained in:
Phil Ringnalda 2010-02-21 21:51:18 -08:00
parent bb55fe310f
commit e46c23ce11
3 changed files with 4 additions and 5 deletions

View File

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

View File

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

View File

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