From c913eb8e2ceae9265b4d1d2d4bf5489a80d353b8 Mon Sep 17 00:00:00 2001
From: "bsmedberg%covad.net" <bsmedberg%covad.net>
Date: Tue, 23 Nov 2004 22:22:58 +0000
Subject: [PATCH] Bug 261232 - Require builders to specify application(s) to
 client.mk and configure when building r=cls (plus additional approval from
 pinkerton for camino-specific changes)

---
 Makefile.in                       |   6 +-
 allmakefiles.sh                   |  10 +-
 browser/config/mozconfig          |  10 +-
 calendar/sunbird/config/mozconfig |  11 +-
 camino.mk                         | 101 +-----
 camino/config/mozconfig           |   2 +
 client.mk                         | 493 ++++++++++++------------------
 config/autoconf.mk.in             |   5 +-
 configure.in                      | 253 ++++++++-------
 mail/config/mozconfig             |   7 +-
 xpfe/bootstrap/nsAppRunner.cpp    |   2 +
 xulrunner/config/mozconfig        |   9 +-
 12 files changed, 366 insertions(+), 543 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 117e912cad4..a986ff0e2eb 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -128,7 +128,7 @@ ifdef MOZ_INSTALLER
 tier_1_dirs	+= modules/zlib/standalone
 endif
 
-ifdef MOZ_INTERNAL_LIBART_LGPL
+ifdef MOZ_SVG_RENDERER_LIBART
 tier_1_dirs	+= other-licenses/libart_lgpl
 endif
 
@@ -396,6 +396,10 @@ tier_99_dirs += embedding/tests
 endif
 endif
 
+ifeq ($(MOZ_BUILD_APP),macbrowser)
+tier_99_dirs += camino
+endif
+
 else
 
 # Standalone build
diff --git a/allmakefiles.sh b/allmakefiles.sh
index e3ee0f7c1e5..eda2d1f9987 100755
--- a/allmakefiles.sh
+++ b/allmakefiles.sh
@@ -1020,6 +1020,10 @@ calendar/sunbird/app/Makefile
 calendar/sunbird/base/Makefile
 "
 
+MAKEFILES_macbrowser="
+camino/Makefile
+"
+
 MAKEFILES_sql="
 extensions/sql/Makefile
 extensions/sql/base/Makefile
@@ -1208,7 +1212,7 @@ if [ "$MOZ_MATHML" ]; then
 fi
 
 #libart
-if [ "$MOZ_INTERNAL_LIBART_LGPL" ]; then
+if [ "$MOZ_SVG_RENDERER_LIBART" ]; then
     MAKEFILES_libart="other-licenses/libart_lgpl/Makefile"
 fi
 
@@ -1541,6 +1545,10 @@ if test -n "$MOZ_SUNBIRD"; then
     add_makefiles "$MAKEFILES_sunbird"
 fi
 
+if test "$MOZ_BUILD_APP" = "macbrowser"; then
+    add_makefiles "$MAKEFILES_macbrowser"
+fi
+
 if test -n "$MOZ_IPCD"; then
     add_makefiles "$MAKEFILES_ipcd"
 fi
diff --git a/browser/config/mozconfig b/browser/config/mozconfig
index e8de967e041..f45446221b6 100644
--- a/browser/config/mozconfig
+++ b/browser/config/mozconfig
@@ -3,14 +3,8 @@
 #  . $topsrcdir/browser/config/mozconfig
 # to the top of your mozconfig file.
 
-MOZ_PHOENIX=1
-export MOZ_PHOENIX
-mk_add_options MOZ_PHOENIX=1
+mk_add_options MOZ_CO_PROJECT=browser
+ac_add_options --enable-application=browser
 
-ac_add_options --disable-ldap
-ac_add_options --disable-mailnews
 ac_add_options --enable-extensions=cookie,xml-rpc,xmlextras,pref,transformiix,universalchardet,typeaheadfind,webservices,inspector,gnomevfs,negotiateauth
 ac_add_options --enable-crypto
-ac_add_options --disable-composer
-ac_add_options --enable-single-profile
-ac_add_options --disable-profilesharing
diff --git a/calendar/sunbird/config/mozconfig b/calendar/sunbird/config/mozconfig
index a4d59442d8c..1e6f866d124 100644
--- a/calendar/sunbird/config/mozconfig
+++ b/calendar/sunbird/config/mozconfig
@@ -3,18 +3,11 @@
 #  . $topsrcdir/calendar/sunbird/config/mozconfig
 # to the top of your mozconfig file.
 
-export MOZ_SUNBIRD=1
-mk_add_options MOZ_SUNBIRD=1
+mk_add_options MOZ_CO_PROJECT=calendar
+ac_add_options --enable-application=calendar
 
-ac_add_options --enable-calendar
-
-ac_add_options --enable-single-profile
-ac_add_options --disable-profilesharing
-ac_add_options --disable-ldap
-ac_add_options --disable-mailnews
 ac_add_options --enable-extensions=pref
 ac_add_options --enable-crypto
-ac_add_options --disable-composer
 ac_add_options --enable-plaintext-editor-only
 ac_add_options --enable-necko-protocols=about,http,file,jar,res
 ac_add_options --disable-accessibility
diff --git a/camino.mk b/camino.mk
index fe5b7d5baf3..1e5c149b860 100644
--- a/camino.mk
+++ b/camino.mk
@@ -35,104 +35,9 @@
 #
 # ***** END LICENSE BLOCK *****
 
-CVS = cvs
-CWD := $(shell pwd)
+$(warning This file is obsolete: use client.mk directly.)
 
-ifeq "$(CWD)" "/"
-CWD := /.
-endif
-
-ifneq (, $(wildcard camino.mk))
-# Ran from mozilla directory
-ROOTDIR   := $(shell dirname $(CWD))
-TOPSRCDIR := $(CWD)
-else
-# Ran from mozilla/.. directory (?)
-ROOTDIR   := $(CWD)
-TOPSRCDIR := $(CWD)/mozilla
-endif
-
-ifndef MAKE
-MAKE := gmake
-endif
-
-CVS_ROOT_IN_TREE := $(shell cat $(TOPSRCDIR)/CVS/Root 2>/dev/null)
-ifneq ($(CVS_ROOT_IN_TREE),)
-ifneq ($(CVS_ROOT_IN_TREE),$(CVSROOT))
-  CVS_FLAGS := -d $(CVS_ROOT_IN_TREE)
-endif
-endif
-
-CVSCO = $(strip $(CVS) $(CVS_FLAGS) co $(CVS_CO_FLAGS))
-CVSCO_LOGFILE := $(ROOTDIR)/cvsco.log
-CVS_CO_LOGFILE := $(shell echo $(CVSCO_LOGFILE) | sed s%//%/%)
-
-ifdef MOZ_CO_TAG
-  CVS_CO_FLAGS := -r $(MOZ_CO_TAG)
-endif
-
-ifeq "$(origin MOZ_CVS_FLAGS)" "undefined"
-  CVS_FLAGS := $(CVS_FLAGS) -q -z 3
-else
-  CVS_FLAGS := $(MOZ_CVS_FLAGS)
-endif
-
-ifeq "$(origin MOZ_CO_FLAGS)" "undefined"
-  CVS_CO_FLAGS := $(CVS_CO_FLAGS) -P
-else
-  CVS_CO_FLAGS := $(CVS_CO_FLAGS) $(MOZ_CO_FLAGS)
-endif
-
-ifdef MOZ_CO_DATE
-  CVS_CO_DATE_FLAGS := -D "$(MOZ_CO_DATE)"
-endif
-
-# export these so they'll be picked up by client.mk
-export MOZ_CO_TAG
-export MOZ_CO_FLAGS
-export MOZ_CO_DATE
-
-CVSCO_CAMINO = $(CVSCO) $(CVS_CO_DATE_FLAGS) mozilla/camino
-
-all: checkout build
-
-checkout::
-	cd $(ROOTDIR) && \
-	$(CVSCO) $(CVS_CO_DATE_FLAGS) mozilla/client.mk && \
-	$(CVSCO) $(CVS_CO_DATE_FLAGS) mozilla/camino/config/mozconfig
-	@cd $(ROOTDIR) && $(MAKE) -f mozilla/client.mk checkout
-	cd $(ROOTDIR) && $(CVSCO) $(CVS_CO_DATE_FLAGS) mozilla/camino.mk
-	@cd $(ROOTDIR) && $(MAKE) -f mozilla/camino.mk real_checkout
-
-real_checkout:
-	@failed=.cvs-failed.tmp; \
-	rm -f $$failed; \
-	cvs_co() { echo "$$@" ; \
-	  ("$$@" || touch $$failed) 2>&1 | tee -a $(CVSCO_LOGFILE) && \
-	  if test -f $$failed; then false; else true; fi; }; \
-	cvs_co $(CVSCO_CAMINO)
-	@echo "camino checkout finish: "`date` | tee -a $(CVSCO_LOGFILE)
-	@conflicts=`egrep "^C " $(CVSCO_LOGFILE)` ;\
-	if test "$$conflicts" ; then \
-	  echo "$(MAKE): *** Conflicts during checkout." ;\
-	  echo "$$conflicts" ;\
-	  echo "$(MAKE): Refer to $(CVSCO_LOGFILE) for full log." ;\
-	  false; \
-	else true; \
-	fi
-
-build_all_dep: alldep
-build_all_depend: alldep
-
-build alldep:
+checkout build alldep clean distclean:
 	$(MAKE) -f client.mk $@
-	cd `$(MAKE) --no-print-directory -f client.mk echo_objdir` && \
-	$(MAKE) -C embedding/config && \
-	CONFIG_FILES=camino/Makefile ./config.status && \
-	$(MAKE) -C camino
 
-clean distclean:
-	$(MAKE) -f client.mk $@
-	cd `$(MAKE) --no-print-directory -f client.mk echo_objdir` && $(RM) -rf camino/build
-
-.PHONY: checkout real_checkout build clean distclean
+.PHONY: checkout build alldep clean distclean
diff --git a/camino/config/mozconfig b/camino/config/mozconfig
index 2f0cb52c2d4..b36c6a8becc 100644
--- a/camino/config/mozconfig
+++ b/camino/config/mozconfig
@@ -1,3 +1,5 @@
+mk_add_options MOZ_CO_PROJECT=macbrowser
+ac_add_options --enable-application=macbrowser
 ac_add_options --enable-default-toolkit=cocoa
 ac_add_options --disable-tests
 ac_add_options --enable-crypto
diff --git a/client.mk b/client.mk
index b852942bf0c..ebce11d30b0 100644
--- a/client.mk
+++ b/client.mk
@@ -20,6 +20,7 @@
 #
 # Contributor(s):
 #   Stephen Lamm
+#   Benjamin Smedberg <bsmedberg@covad.net>
 #
 # Alternatively, the contents of this file may be used under the terms of
 # either the GNU General Public License Version 2 or later (the "GPL"), or
@@ -35,17 +36,36 @@
 #
 # ***** END LICENSE BLOCK *****
 
-# Build the Mozilla client.
+# Build a mozilla application.
 #
-# This needs CVSROOT set to work, e.g.,
-#   setenv CVSROOT :pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot
-# or
-#   setenv CVSROOT :pserver:username%somedomain.org@cvs.mozilla.org:/cvsroot
-# 
 # To checkout and build a tree,
 #    1. cvs co mozilla/client.mk
 #    2. cd mozilla
-#    3. gmake -f client.mk
+#    3. create your .mozconfig file with
+#       mk_add_options MOZ_CO_PROJECT=suite,browser,mail,xulrunner
+#    4. gmake -f client.mk 
+#
+# This script will pick up the CVSROOT from the CVS/Root file. If you wish
+# to use a different CVSROOT, you must set CVSROOT in your environment:
+#
+#   export CVSROOT=:pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot
+#   export CVSROOT=:pserver:username%somedomain.org@cvs.mozilla.org:/cvsroot
+# 
+# You must specify which products/modules you wish to checkout, with
+#   MOZ_CO_PROJECT, MOZ_CO_MODULE, and BUILD_MODULES variables.
+#
+#   MOZ_CO_PROJECT possibilities include the following:
+#     suite (Seamonkey suite)
+#     browser (aka Firefox)
+#     mail (aka Thunderbird)
+#     composer (standalone composer, aka NVU)
+#     calendar (aka Sunbird, use this to build the calendar extensions also)
+#     xulrunner
+#     macbrowser (aka Camino)
+#
+# Other common MOZ_CO_MODULE options include the following:
+#   mozilla/other-licenses/libart_lgpl
+#   mozilla/tools/codesighs
 #
 # Other targets (gmake -f client.mk [targets...]),
 #    checkout
@@ -53,44 +73,113 @@
 #    clean (realclean is now the same as clean)
 #    distclean
 #
-# See http://www.mozilla.org/build/unix.html for more information.
+# See http://www.mozilla.org/build/ for more information.
 #
 # Options:
 #   MOZ_OBJDIR           - Destination object directory
 #   MOZ_CO_DATE          - Date tag to use for checkout (default: none)
-#   MOZ_CO_MODULE        - Module to checkout (default: SeaMonkeyAll)
+#   MOZ_CO_MODULE        - Module to checkout
 #   MOZ_CVS_FLAGS        - Flags to pass cvs (default: -q -z3)
 #   MOZ_CO_FLAGS         - Flags to pass after 'cvs co' (default: -P)
 #   MOZ_MAKE_FLAGS       - Flags to pass to $(MAKE)
-#   MOZ_CO_BRANCH        - Branch tag (Deprecated. Use MOZ_CO_TAG below.)
-#   MOZ_CO_LOCALES       - localizations to pull (MOZ_CO_LOCALES="de-DE pt-BR")
+#   MOZ_CO_LOCALES       - localizations to pull (MOZ_CO_LOCALES="de-DE,pt-BR")
+#   MOZ_LOCALE_DIRS      - directories which contain localizations
 #   LOCALES_CVSROOT      - CVSROOT to use to pull localizations
 #
 
+AVAILABLE_PROJECTS = \
+  suite \
+  toolkit \
+  browser \
+  mail \
+  composer \
+  calendar \
+  xulrunner \
+  macbrowser \
+  $(NULL)
+
+MODULES_suite :=                                \
+  SeaMonkeyAll                                  \
+  mozilla/ipc/ipcd                              \
+  mozilla/modules/libpr0n                       \
+  mozilla/accessible                            \
+  mozilla/security/manager                      \
+  mozilla/toolkit                               \
+  $(NULL)
+
+MODULES_toolkit :=                              \
+  $(MODULES_suite)                              \
+  mozilla/chrome                                \
+  $(NULL)
+
+LOCALES_toolkit :=                              \
+  mozilla/toolkit/locales                       \
+  $(NULL)
+
+MODULES_browser :=                              \
+  $(MODULES_toolkit)                            \
+  mozilla/browser                               \
+  mozilla/other-licenses/branding/firefox       \
+  mozilla/other-licenses/7zstub/firefox         \
+  $(NULL)
+
+LOCALES_browser :=                              \
+  $(LOCALES_toolkit)                            \
+  mozilla/browser/locales                       \
+  $(NULL)
+
+MODULES_mail :=                                 \
+  $(MODULES_toolkit)                            \
+  mozilla/mail                                  \
+  mozilla/other-licenses/branding/thunderbird   \
+  mozilla/other-licenses/7zstub/thunderbird     \
+  $(NULL)
+
+LOCALES_mail :=                                 \
+  $(LOCALES_toolkit)                            \
+  mozilla/mail/locales                          \
+  $(NULL)
+
+MODULES_composer :=                             \
+  $(MODULES_toolkit)                            \
+  mozilla/composer                              \
+  $(NULL)
+
+MODULES_calendar :=                             \
+  $(MODULES_toolkit)                            \
+  mozilla/calendar                              \
+  mozilla/other-licenses/libical                \
+  $(NULL)
+
+MODULES_xulrunner :=                            \
+  $(MODULES_toolkit)                            \
+  mozilla/xulrunner                             \
+  $(NULL)
+
+MODULES_macbrowser :=                           \
+  $(MODULES_suite)                              \
+  camino                                        \
+  $(NULL)
+
 #######################################################################
 # Checkout Tags
 #
 # For branches, uncomment the MOZ_CO_TAG line with the proper tag,
 # and commit this file on that tag.
-#MOZ_CO_TAG = <tag>
-NSPR_CO_TAG = NSPRPUB_PRE_4_2_CLIENT_BRANCH
-PSM_CO_TAG = #We will now build PSM from the tip instead of a branch.
-NSS_CO_TAG = NSS_CLIENT_TAG
-LDAPCSDK_CO_TAG = ldapcsdk_50_client_branch
-ACCESSIBLE_CO_TAG = 
-IMGLIB2_CO_TAG = 
-IPC_CO_TAG = 
-TOOLKIT_CO_TAG =
-BROWSER_CO_TAG =
-MAIL_CO_TAG =
-STANDALONE_COMPOSER_CO_TAG =
-LOCALES_CO_TAG =
+#MOZ_CO_TAG          = <tag>
+NSPR_CO_TAG          = NSPRPUB_PRE_4_2_CLIENT_BRANCH
+NSS_CO_TAG           = NSS_CLIENT_TAG
+LDAPCSDK_CO_TAG      = ldapcsdk_50_client_branch
+LOCALES_CO_TAG       =
+
 BUILD_MODULES = all
 
+
 #######################################################################
 # Defines
 #
 CVS = cvs
+comma := ,
 
 CWD := $(shell pwd)
 
@@ -147,14 +236,12 @@ ifneq ($(CVS_ROOT_IN_TREE),$(CVSROOT))
 endif
 endif
 
-CVSCO = $(strip $(CVS) $(CVS_FLAGS) co $(CVS_CO_FLAGS))
+CVS_CO_DATE_FLAGS = $(if $(MOZ_CO_DATE),-D "$(MOZ_CO_DATE)")
+CVSCO = $(CVS) $(CVS_FLAGS) co $(MOZ_CO_FLAGS) $(if $(MOZ_CO_TAG),-r $(MOZ_CO_TAG)) $(CVS_CO_DATE_FLAGS)
+
 CVSCO_LOGFILE := $(ROOTDIR)/cvsco.log
 CVSCO_LOGFILE := $(shell echo $(CVSCO_LOGFILE) | sed s%//%/%)
 
-ifdef MOZ_CO_TAG
-  CVS_CO_FLAGS := -r $(MOZ_CO_TAG)
-endif
-
 # if LOCALES_CVSROOT is not specified, set it here
 # (and let mozconfig override it)
 LOCALES_CVSROOT ?= :pserver:anonymous@cvs-mirror.mozilla.org:/l10n
@@ -162,8 +249,8 @@ LOCALES_CVSROOT ?= :pserver:anonymous@cvs-mirror.mozilla.org:/l10n
 ####################################
 # Load mozconfig Options
 
-# See build pages, http://www.mozilla.org/build/unix.html, 
-# for how to set up mozconfig.
+# See build pages, http://www.mozilla.org/build/ for how to set up mozconfig.
+
 MOZCONFIG_LOADER := mozilla/build/autoconf/mozconfig2client-mk
 MOZCONFIG_FINDER := mozilla/build/autoconf/mozconfig-find 
 MOZCONFIG_MODULES := mozilla/build/unix/modules.mk mozilla/build/unix/uniq.pl
@@ -180,6 +267,15 @@ include $(TOPSRCDIR)/build/unix/modules.mk
 ####################################
 # Options that may come from mozconfig
 
+MOZ_PROJECT_LIST := $(subst $(comma), ,$(MOZ_CO_PROJECT))
+
+ifneq (,$(filter-out $(AVAILABLE_PROJECTS),$(MOZ_PROJECT_LIST)))
+$(error MOZ_CO_PROJECT contains an unrecognized project.)
+endif
+
+MOZ_MODULE_LIST := $(subst $(comma), ,$(MOZ_CO_MODULE)) $(foreach project,$(MOZ_PROJECT_LIST),$(MODULES_$(project)))
+LOCALE_DIRS := $(MOZ_LOCALE_DIRS) $(foreach project,$(MOZ_CO_PROJECT),$(LOCALES_$(project)))
+
 # Change CVS flags if anonymous root is requested
 ifdef MOZ_CO_USE_MIRROR
   CVS_FLAGS := -d :pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot
@@ -192,24 +288,6 @@ else
   CVS_FLAGS := $(MOZ_CVS_FLAGS)
 endif
 
-# This option is deprecated. The best way to have client.mk pull a tag
-# is to set MOZ_CO_TAG (see above) and commit that change on the tag.
-ifdef MOZ_CO_BRANCH
-  $(warning Use MOZ_CO_TAG instead of MOZ_CO_BRANCH)
-  CVS_CO_FLAGS := -r $(MOZ_CO_BRANCH)
-endif
-
-# MOZ_CO_FLAGS - Anything that we should use on all checkouts
-ifeq "$(origin MOZ_CO_FLAGS)" "undefined"
-  CVS_CO_FLAGS := $(CVS_CO_FLAGS) -P
-else
-  CVS_CO_FLAGS := $(CVS_CO_FLAGS) $(MOZ_CO_FLAGS)
-endif
-
-ifdef MOZ_CO_DATE
-  CVS_CO_DATE_FLAGS := -D "$(MOZ_CO_DATE)"
-endif
-
 ifdef MOZ_OBJDIR
   OBJDIR := $(MOZ_OBJDIR)
   MOZ_MAKE := $(MAKE) $(MOZ_MAKE_FLAGS) -C $(OBJDIR)
@@ -218,23 +296,11 @@ else
   MOZ_MAKE := $(MAKE) $(MOZ_MAKE_FLAGS)
 endif
 
-####################################
-# CVS defines for PSM
-#
-PSM_CO_MODULE= mozilla/security/manager
-PSM_CO_FLAGS := -P -A
-ifdef MOZ_CO_FLAGS
-  PSM_CO_FLAGS := $(MOZ_CO_FLAGS)
-endif
-ifdef PSM_CO_TAG
-  PSM_CO_FLAGS := $(PSM_CO_FLAGS) -r $(PSM_CO_TAG)
-endif
-CVSCO_PSM = $(CVS) $(CVS_FLAGS) co $(PSM_CO_FLAGS) $(CVS_CO_DATE_FLAGS) $(PSM_CO_MODULE)
-
 ####################################
 # CVS defines for NSS
 #
-NSS_CO_MODULE = mozilla/security/nss \
+NSS_CO_MODULE =               \
+		mozilla/security/nss      \
 		mozilla/security/coreconf \
 		$(NULL)
 
@@ -242,9 +308,8 @@ NSS_CO_FLAGS := -P
 ifdef MOZ_CO_FLAGS
   NSS_CO_FLAGS := $(MOZ_CO_FLAGS)
 endif
-ifdef NSS_CO_TAG
-   NSS_CO_FLAGS := $(NSS_CO_FLAGS) -r $(NSS_CO_TAG)
-endif
+NSS_CO_FLAGS := $(NSS_CO_FLAGS) $(if $(NSS_CO_TAG),-r $(NSS_CO_TAG),-A)
+
 # Cannot pull static tags by date
 ifeq ($(NSS_CO_TAG),NSS_CLIENT_TAG)
 CVSCO_NSS = $(CVS) $(CVS_FLAGS) co $(NSS_CO_FLAGS) $(NSS_CO_MODULE)
@@ -260,9 +325,8 @@ NSPR_CO_FLAGS := -P
 ifdef MOZ_CO_FLAGS
   NSPR_CO_FLAGS := $(MOZ_CO_FLAGS)
 endif
-ifdef NSPR_CO_TAG
-  NSPR_CO_FLAGS := $(NSPR_CO_FLAGS) -r $(NSPR_CO_TAG)
-endif
+NSPR_CO_FLAGS := $(NSPR_CO_FLAGS) $(if $(NSPR_CO_TAG),-r $(NSPR_CO_TAG),-A)
+
 # Cannot pull static tags by date
 ifeq ($(NSPR_CO_TAG),NSPRPUB_CLIENT_TAG)
 CVSCO_NSPR = $(CVS) $(CVS_FLAGS) co $(NSPR_CO_FLAGS) $(NSPR_CO_MODULE)
@@ -278,64 +342,9 @@ LDAPCSDK_CO_FLAGS := -P
 ifdef MOZ_CO_FLAGS
   LDAPCSDK_CO_FLAGS := $(MOZ_CO_FLAGS)
 endif
-ifdef LDAPCSDK_CO_TAG
-  LDAPCSDK_CO_FLAGS := $(LDAPCSDK_CO_FLAGS) -r $(LDAPCSDK_CO_TAG)
-endif
+LDAPCSDK_CO_FLAGS := $(LDAPCSDK_CO_FLAGS) $(if $(LDAPCSDK_CO_TAG),-r $(LDAPCSDK_CO_TAG),-A)
 CVSCO_LDAPCSDK = $(CVS) $(CVS_FLAGS) co $(LDAPCSDK_CO_FLAGS) $(CVS_CO_DATE_FLAGS) $(LDAPCSDK_CO_MODULE)
 
-####################################
-# CVS defines for the C LDAP SDK
-#
-ACCESSIBLE_CO_MODULE = mozilla/accessible
-ACCESSIBLE_CO_FLAGS := -P
-ifdef MOZ_CO_FLAGS
-  ACCESSIBLE_CO_FLAGS := $(MOZ_CO_FLAGS)
-endif
-ifdef ACCESSIBLE_CO_TAG
-  ACCESSIBLE_CO_FLAGS := $(ACCESSIBLE_CO_FLAGS) -r $(ACCESSIBLE_CO_TAG)
-endif
-CVSCO_ACCESSIBLE = $(CVS) $(CVS_FLAGS) co $(ACCESSIBLE_CO_FLAGS) $(CVS_CO_DATE_FLAGS) $(ACCESSIBLE_CO_MODULE)
-
-
-####################################
-# CVS defines for new image library
-#
-IMGLIB2_CO_MODULE = mozilla/modules/libpr0n
-IMGLIB2_CO_FLAGS := -P
-ifdef MOZ_CO_FLAGS
-  IMGLIB2_CO_FLAGS := $(MOZ_CO_FLAGS)
-endif
-ifdef IMGLIB2_CO_TAG
-  IMGLIB2_CO_FLAGS := $(IMGLIB2_CO_FLAGS) -r $(IMGLIB2_CO_TAG)
-endif
-CVSCO_IMGLIB2 = $(CVS) $(CVS_FLAGS) co $(IMGLIB2_CO_FLAGS) $(CVS_CO_DATE_FLAGS) $(IMGLIB2_CO_MODULE)
-
-####################################
-# CVS defines for ipc module
-#
-IPC_CO_MODULE = mozilla/ipc/ipcd
-IPC_CO_FLAGS := -P -A
-ifdef MOZ_CO_FLAGS
-  IPC_CO_FLAGS := $(MOZ_CO_FLAGS)
-endif
-ifdef IPC_CO_TAG
-  IPC_CO_FLAGS := $(IPC_CO_FLAGS) -r $(IPC_CO_TAG)
-endif
-CVSCO_IPC = $(CVS) $(CVS_FLAGS) co $(IPC_CO_FLAGS) $(CVS_CO_DATE_FLAGS) $(IPC_CO_MODULE)
-
-####################################
-# CVS defines for Calendar 
-#
-CVSCO_CALENDAR := $(CVSCO) $(CVS_CO_DATE_FLAGS) mozilla/calendar mozilla/other-licenses/libical
-
-####################################
-# CVS defines for SeaMonkey
-#
-ifeq ($(MOZ_CO_MODULE),)
-  MOZ_CO_MODULE := SeaMonkeyAll
-endif
-CVSCO_SEAMONKEY := $(CVSCO) $(CVS_CO_DATE_FLAGS) $(MOZ_CO_MODULE)
-
 ####################################
 # CVS defines for standalone modules
 #
@@ -346,178 +355,86 @@ else
   STANDALONE_CO_MODULE := $(filter-out $(NSPRPUB_DIR) security directory/c-sdk, $(BUILD_MODULE_CVS))
   STANDALONE_CO_MODULE += allmakefiles.sh client.mk aclocal.m4 configure configure.in
   STANDALONE_CO_MODULE += Makefile.in
-  STANDALONE_CO_MODULE := $(addprefix mozilla/, $(STANDALONE_CO_MODULE))
-  CHECKOUT_STANDALONE := cvs_co $(CVSCO) $(CVS_CO_DATE_FLAGS) $(STANDALONE_CO_MODULE)
 
-  NOSUBDIRS_MODULE := $(addprefix mozilla/, $(BUILD_MODULE_CVS_NS))
-ifneq ($(NOSUBDIRS_MODULE),)
-  CHECKOUT_STANDALONE_NOSUBDIRS := cvs_co $(CVSCO) -l $(CVS_CO_DATE_FLAGS) $(NOSUBDIRS_MODULE)
-else
-  CHECKOUT_STANDALONE_NOSUBDIRS := true
-endif
+	MOZ_MODULE_LIST += $(addprefix mozilla/,$(STANDALONE_CO_MODULE))
+  NOSUBDIRS_MODULE := $(addprefix mozilla/,$(BUILD_MODULE_CVS_NS))
 
-CVSCO_SEAMONKEY :=
-ifeq (,$(filter $(NSPRPUB_DIR), $(BUILD_MODULE_CVS)))
+ifeq (,$(filter $(NSPRPUB_DIR), $(BUILD_MODULE_CVS))$(MOZ_CO_PROJECT))
   CVSCO_NSPR :=
 endif
-ifeq (,$(filter security security/manager, $(BUILD_MODULE_CVS)))
-  CVSCO_PSM :=
+ifeq (,$(filter security security/manager, $(BUILD_MODULE_CVS))$(MOZ_CO_PROJECT))
   CVSCO_NSS :=
 endif
-ifeq (,$(filter directory/c-sdk, $(BUILD_MODULE_CVS)))
+ifeq (,$(filter directory/c-sdk, $(BUILD_MODULE_CVS))$(MOZ_CO_PROJECT))
   CVSCO_LDAPCSDK :=
 endif
-ifeq (,$(filter accessible, $(BUILD_MODULE_CVS)))
-  CVSCO_ACCESSIBLE :=
-endif
-ifeq (,$(filter modules/libpr0n, $(BUILD_MODULE_CVS)))
-  CVSCO_IMGLIB2 :=
-endif
-ifeq (,$(filter ipc, $(BUILD_MODULE_CVS)))
-  CVSCO_IPC :=
-endif
-ifeq (,$(filter calendar other-licenses/libical, $(BUILD_MODULE_CVS)))
-  CVSCO_CALENDAR :=
-endif
 endif
 
 ####################################
-# CVS defined for libart (pulled and built if MOZ_INTERNAL_LIBART_LGPL is set)
+# Error on obsolete variables.
 #
-CVSCO_LIBART := $(CVSCO) $(CVS_CO_DATE_FLAGS) mozilla/other-licenses/libart_lgpl
-
-ifdef MOZ_INTERNAL_LIBART_LGPL
-FASTUPDATE_LIBART := fast_update $(CVSCO_LIBART)
-CHECKOUT_LIBART := cvs_co $(CVSCO_LIBART)
-else
-CHECKOUT_LIBART := true
-FASTUPDATE_LIBART := true
-endif
-
-####################################
-# CVS defines for Phoenix (pulled and built if MOZ_PHOENIX is set)
-#
-BROWSER_CO_FLAGS := -P
-ifdef MOZ_CO_FLAGS
-  BROWSER_CO_FLAGS := $(MOZ_CO_FLAGS)
-endif
-ifdef BROWSER_CO_TAG
-  BROWSER_CO_FLAGS := $(BROWSER_CO_FLAGS) -r $(BROWSER_CO_TAG)
-endif
-
-BROWSER_CO_DIRS := mozilla/browser mozilla/other-licenses/branding/firefox mozilla/other-licenses/7zstub/firefox
-
-CVSCO_PHOENIX := $(CVS) $(CVS_FLAGS) co $(BROWSER_CO_FLAGS) $(CVS_CO_DATE_FLAGS) $(BROWSER_CO_DIRS)
-
-ifdef MOZ_PHOENIX
-FASTUPDATE_PHOENIX := fast_update $(CVSCO_PHOENIX)
-CHECKOUT_PHOENIX := cvs_co $(CVSCO_PHOENIX)
-MOZ_XUL_APP = 1
-LOCALE_DIRS += mozilla/browser/locales
-else
-CHECKOUT_PHOENIX := true
-FASTUPDATE_PHOENIX := true
-endif
-
-####################################
-# CVS defines for Thunderbird (pulled and built if MOZ_THUNDERBIRD is set)
-#
-
-MAIL_CO_FLAGS := -P
-ifdef MOZ_CO_FLAGS
-  MAIL_CO_FLAGS := $(MOZ_CO_FLAGS)
-endif
-ifdef MAIL_CO_TAG
-  MAIL_CO_FLAGS := $(MAIL_CO_FLAGS) -r $(MAIL_CO_TAG)
-endif
-
-MAIL_CO_DIRS := mozilla/mail mozilla/other-licenses/branding/thunderbird mozilla/other-licenses/7zstub/thunderbird
-
-CVSCO_THUNDERBIRD := $(CVS) $(CVS_FLAGS) co $(MAIL_CO_FLAGS) $(CVS_CO_DATE_FLAGS) $(MAIL_CO_DIRS)
-ifdef MOZ_THUNDERBIRD
-FASTUPDATE_THUNDERBIRD := fast_update $(CVSCO_THUNDERBIRD)
-CHECKOUT_THUNDERBIRD := cvs_co $(CVSCO_THUNDERBIRD)
-MOZ_XUL_APP = 1
-LOCALE_DIRS += mozilla/mail/locales
-else
-FASTUPDATE_THUNDERBIRD := true
-CHECKOUT_THUNDERBIRD := true
-endif
-
-####################################
-# CVS defines for Standalone Composer (pulled and built if MOZ_STANDALONE_COMPOSER is set)
-#
-
-STANDALONE_COMPOSER_CO_FLAGS := -P
-ifdef MOZ_CO_FLAGS
-  STANDALONE_COMPOSER_CO_FLAGS := $(MOZ_CO_FLAGS)
-endif
-ifdef STANDALONE_COMPOSER_CO_TAG
-  STANDALONE_COMPOSER_CO_FLAGS := $(STANDALONE_COMPOSER_CO_FLAGS) -r $(STANDALONE_COMPOSER_CO_TAG)
-endif
-
-CVSCO_STANDALONE_COMPOSER := $(CVS) $(CVS_FLAGS) co $(STANDALONE_COMPOSER_CO_FLAGS) $(CVS_CO_DATE_FLAGS) mozilla/composer
-ifdef MOZ_STANDALONE_COMPOSER
-FASTUPDATE_STANDALONE_COMPOSER:= fast_update $(CVSCO_STANDALONE_COMPOSER)
-CHECKOUT_STANDALONE_COMPOSER:= cvs_co $(CVSCO_STANDALONE_COMPOSER)
-MOZ_XUL_APP = 1
-LOCALE_DIRS += mozilla/composer/locales
-else
-FASTUPDATE_STANDALONE_COMPOSER:= true
-CHECKOUT_STANDALONE_COMPOSER:= true
-endif
-
-####################################
-# CVS defines for Sunbird (pulled and built if MOZ_SUNBIRD is set)
-#
-
-ifdef MOZ_SUNBIRD
-MOZ_XUL_APP = 1
-endif
-
-####################################
-# CVS defines for mozilla/toolkit
-#
-
-TOOLKIT_CO_FLAGS := -P
-ifdef MOZ_CO_FLAGS
-  TOOLKIT_CO_FLAGS := $(MOZ_CO_FLAGS)
-endif
-ifdef TOOLKIT_CO_TAG
-  TOOLKIT_CO_FLAGS := $(TOOLKIT_CO_FLAGS) -r $(TOOLKIT_CO_TAG)
-endif
-
-CVSCO_MOZTOOLKIT := $(CVS) $(CVS_FLAGS) co $(TOOLKIT_CO_FLAGS) $(CVS_CO_DATE_FLAGS)  mozilla/toolkit mozilla/chrome mozilla/xulrunner
-FASTUPDATE_MOZTOOLKIT := fast_update $(CVSCO_MOZTOOLKIT)
-CHECKOUT_MOZTOOLKIT := cvs_co $(CVSCO_MOZTOOLKIT)
-LOCALE_DIRS += mozilla/toolkit/locales
-
-####################################
-# CVS defines for codesighs (pulled and built if MOZ_MAPINFO is set)
-#
-CVSCO_CODESIGHS := $(CVSCO) $(CVS_CO_DATE_FLAGS) mozilla/tools/codesighs
 
 ifdef MOZ_MAPINFO
-FASTUPDATE_CODESIGHS := fast_update $(CVSCO_CODESIGHS)
-CHECKOUT_CODESIGHS := cvs_co $(CVSCO_CODESIGHS)
+$(error MOZ_MAPINFO is obsolete, use MOZ_CO_MODULE=mozilla/tools/codesighs instead.)
+endif
+ifdef MOZ_INTERNAL_LIBART_LGPL
+$(error MOZ_INTERNAL_LIBART_LGPL is obsolete, use MOZ_CO_MODULE=mozilla/other-licenses/libart_lgpl instead.)
+endif
+ifdef MOZ_PHOENIX
+$(error MOZ_PHOENIX is obsolete, use MOZ_CO_PROJECT=browser and --enable-application=browser)
+endif
+ifdef MOZ_THUNDERBIRD
+$(error MOZ_THUNDERBIRD is obsolete, use MOZ_CO_PROJECT=mail and --enable-application=mail)
+endif
+
+###################################
+# Checkout main modules
+#
+
+# sort is used to remove duplicates
+MOZ_MODULE_LIST := $(sort $(MOZ_MODULE_LIST))
+
+MODULES_CO_FLAGS := -P
+ifdef MOZ_CO_FLAGS
+  MODULES_CO_FLAGS := $(MOZ_CO_FLAGS)
+endif
+MODULES_CO_FLAGS := $(MODULES_CO_FLAGS) $(if $(MOZ_CO_TAG),-r $(MOZ_CO_TAG),-A)
+
+CVSCO_MODULES = $(CVS) $(CVS_FLAGS) co $(MODULES_CO_FLAGS) $(CVS_CO_DATE_FLAGS) $(MOZ_MODULE_LIST)
+CVSCO_MODULES_NS = $(CVS) $(CVS_FLAGS) co $(MODULES_CO_FLAGS) $(CVS_CO_DATE_FLAGS) -l $(NOSUBDIRS_MODULE)
+
+ifeq (,$(MOZ_MODULE_LIST))
+FASTUPDATE_MODULES = $(error No modules or projects were specified. Use MOZ_CO_PROJECT to specify a project for checkout.)
+CHECKOUT_MODULES   = $(error No modules or projects were specified. Use MOZ_CO_PROJECT to specify a project for checkout.)
 else
-CHECKOUT_CODESIGHS := true
-FASTUPDATE_CODESIGHS := true
+FASTUPDATE_MODULES := fast_update $(CVSCO_MODULES)
+CHECKOUT_MODULES   := cvs_co      $(CVSCO_MODULES)
+endif
+ifeq (,$(NOSUBDIRS_MODULE))
+FASTUPDATE_MODULES_NS := true
+CHECKOUT_MODULES_NS   := true
+else
+FASTUPDATE_MODULES_NS := fast_update $(CVSCO_MODULES_NS)
+CHECKOUT_MODULES_NS   := cvs_co      $(CVSCO_MODULES_NS)
 endif
 
 ###################################
 # CVS defines for locales
 #
-LOCALES_CO_FLAGS := -P
 
-ifdef LOCALES_CO_TAG
-  LOCALES_CO_FLAGS := $(LOCALES_CO_FLAGS) -r $(LOCALES_CO_TAG)
+LOCALES_CO_FLAGS := -P
+ifdef MOZ_CO_FLAGS
+  LOCALES_CO_FLAGS := $(MOZ_CO_FLAGS)
 endif
+LOCALES_CO_FLAGS := $(LOCALES_CO_FLAGS) $(if $(LOCALES_CO_TAG),-r $(LOCALES_CO_TAG),-A)
 
 ifndef MOZ_CO_LOCALES
 FASTUPDATE_LOCALES := true
 CHECKOUT_LOCALES := true
 else
+
+override MOZ_CO_LOCALES := $(subst $(comma), ,$(MOZ_CO_LOCALES))
+
 ifeq (all,$(MOZ_CO_LOCALES))
 MOZCONFIG_MODULES += $(addsuffix /all-locales,$(LOCALE_DIRS))
 
@@ -535,7 +452,7 @@ CHECKOUT_LOCALES := \
     done; \
   done
 
-else
+else # MOZ_CO_LOCALES != all
 LOCALE_CO_DIRS = $(foreach locale,$(MOZ_CO_LOCALES),$(addsuffix /$(locale),$(LOCALE_DIRS)))
 
 CVSCO_LOCALES := $(CVS) $(CVS_FLAGS) -d $(LOCALES_CVSROOT) co $(LOCALES_CO_FLAGS) $(LOCALE_CO_DIRS)
@@ -601,24 +518,12 @@ real_checkout:
 	@set -e; \
 	cvs_co() { set -e; echo "$$@" ; \
 	  "$$@" 2>&1 | tee -a $(CVSCO_LOGFILE); }; \
-	$(CHECKOUT_STANDALONE); \
-	$(CHECKOUT_STANDALONE_NOSUBDIRS); \
 	cvs_co $(CVSCO_NSPR); \
 	cvs_co $(CVSCO_NSS); \
-	cvs_co $(CVSCO_PSM); \
 	cvs_co $(CVSCO_LDAPCSDK); \
-	cvs_co $(CVSCO_ACCESSIBLE); \
-	cvs_co $(CVSCO_IMGLIB2); \
-	cvs_co $(CVSCO_IPC); \
-	cvs_co $(CVSCO_CALENDAR); \
-	$(CHECKOUT_LIBART); \
-	$(CHECKOUT_MOZTOOLKIT); \
-	$(CHECKOUT_PHOENIX); \
-	$(CHECKOUT_THUNDERBIRD); \
-	$(CHECKOUT_STANDALONE_COMPOSER); \
-	$(CHECKOUT_CODESIGHS); \
-	$(CHECKOUT_LOCALES); \
-	cvs_co $(CVSCO_SEAMONKEY);
+	$(CHECKOUT_MODULES); \
+	$(CHECKOUT_MODULES_NS); \
+	$(CHECKOUT_LOCALES);
 	@echo "checkout finish: "`date` | tee -a $(CVSCO_LOGFILE)
 # update the NSS checkout timestamp
 	@if test `egrep -c '^(U|C) mozilla/security/(nss|coreconf)' $(CVSCO_LOGFILE) 2>/dev/null` != 0; then \
@@ -669,20 +574,10 @@ real_fast-update:
 	cd $(ROOTDIR); \
 	cvs_co $(CVSCO_NSS); \
 	cd mozilla; \
-	fast_update $(CVSCO_PSM); \
 	fast_update $(CVSCO_LDAPCSDK); \
-	fast_update $(CVSCO_ACCESSIBLE); \
-	fast_update $(CVSCO_IMGLIB2); \
-	fast_update $(CVSCO_IPC); \
-	fast_update $(CVSCO_CALENDAR); \
-	$(FASTUPDATE_LIBART); \
-	$(FASTUPDATE_MOZTOOLKIT); \
-	$(FASTUPDATE_PHOENIX); \
-	$(FASTUPDATE_THUNDERBIRD); \
-	$(FASTUPDATE_STANDALONE_COMPOSER); \
-	$(FASTUPDATE_CODESIGHS); \
-	$(FASTUPDATE_LOCALES); \
-	fast_update $(CVSCO_SEAMONKEY);
+	$(FASTUPDATE_MODULES); \
+	$(FASTUPDATE_MODULES_NS); \
+	$(FASTUPDATE_LOCALES);
 	@echo "fast_update finish: "`date` | tee -a $(CVSCO_LOGFILE)
 # update the NSS checkout timestamp
 	@if test `egrep -c '^(U|C) mozilla/security/(nss|coreconf)' $(CVSCO_LOGFILE) 2>/dev/null` != 0; then \
diff --git a/config/autoconf.mk.in b/config/autoconf.mk.in
index 1334beadaff..bf7b5de0c85 100644
--- a/config/autoconf.mk.in
+++ b/config/autoconf.mk.in
@@ -42,6 +42,7 @@ USE_AUTOCONF 	= 1
 MOZILLA_CLIENT	= 1
 BUILD_MODULES	= @BUILD_MODULES@
 MOZILLA_VERSION = @MOZILLA_VERSION@
+MOZ_BUILD_APP = @MOZ_BUILD_APP@
 MOZ_APP_NAME	= @MOZ_APP_NAME@
 MOZ_APP_VERSION = @MOZ_APP_VERSION@
 
@@ -161,8 +162,6 @@ MOZ_NATIVE_ZLIB	= @SYSTEM_ZLIB@
 MOZ_NATIVE_JPEG	= @SYSTEM_JPEG@
 MOZ_NATIVE_PNG	= @SYSTEM_PNG@
 
-MOZ_INTERNAL_LIBART_LGPL = @MOZ_INTERNAL_LIBART_LGPL@
-
 MOZ_UPDATE_XTERM = @MOZ_UPDATE_XTERM@
 MOZ_MATHML = @MOZ_MATHML@
 MOZ_XTF = @MOZ_XTF@
@@ -177,7 +176,7 @@ TX_EXE = @TX_EXE@
 # Mac's don't like / in a #include, so we include the libart
 # headers locally if we're using the external library
 ifdef MOZ_LIBART_CFLAGS
-ifndef MOZ_INTERNAL_LIBART_LGPL
+ifndef MOZ_SVG_RENDERER_LIBART
 MOZ_LIBART_CFLAGS := $(MOZ_LIBART_CFLAGS)/libart_lgpl
 endif
 endif
diff --git a/configure.in b/configure.in
index d1b2f68828f..089d24d52d3 100644
--- a/configure.in
+++ b/configure.in
@@ -29,11 +29,12 @@ dnl               Dan Mosedale <dmose@mozilla.org>
 dnl                 LDAP support
 dnl               Seth Spitzer <sspitzer@netscape.com>
 dnl                 xpctools support
+dnl               Benjamin Smedberg <bsmedberg@covad.net>
 dnl
 dnl Process this file with autoconf to produce a configure script.
 dnl ========================================================
 
-AC_PREREQ(2.12)
+AC_PREREQ(2.13)
 AC_INIT(config/config.mk)
 AC_CONFIG_AUX_DIR(${srcdir}/build/autoconf)
 AC_CANONICAL_SYSTEM
@@ -569,7 +570,6 @@ TARGET_MD_ARCH=unix
 DIRENT_INO=d_ino
 CYGWIN_WRAPPER=
 MOZ_USER_DIR=".mozilla"
-MOZ_APP_NAME=mozilla
 
 MOZ_JPEG_CFLAGS=
 MOZ_JPEG_LIBS='-L$(DIST)/lib -lmozjpeg'
@@ -908,7 +908,6 @@ esac
 dnl Get mozilla version from central milestone file
 MOZILLA_VERSION=`$PERL $srcdir/config/milestone.pl -topsrcdir $srcdir`
 AC_DEFINE_UNQUOTED(MOZILLA_VERSION,"$MOZILLA_VERSION")
-MOZ_APP_VERSION=$MOZILLA_VERSION
 
 dnl ========================================================
 dnl System overrides of the defaults for target
@@ -3412,6 +3411,124 @@ then
 fi
 AC_SUBST(MOZ_X11)
 
+dnl ========================================================
+dnl =
+dnl = Application
+dnl =
+dnl ========================================================
+
+MOZ_ARG_HEADER(Application)
+
+MOZ_CALENDAR=
+MOZ_MAIL_NEWS=
+MOZ_STATIC_MAIL_BUILD=
+MOZ_SINGLE_PROFILE=
+MOZ_PROFILESHARING=1
+MOZ_IPCD=
+MOZ_PROFILELOCKING=1
+
+MOZ_ARG_ENABLE_STRING(application,
+[  --enable-application=APP
+                          Options include:
+                            suite
+                            browser (Firefox)
+                            mail (Thunderbird)
+                            composer
+                            calendar
+                            xulrunner
+                            macbrowser (Camino)
+                            standalone (use this for standalone
+                              xpcom/xpconnect or to manually drive a build)],
+[ MOZ_BUILD_APP=$enableval ] )
+
+case "$MOZ_BUILD_APP" in
+suite)
+  MOZ_APP_NAME=mozilla
+  MOZ_MAIL_NEWS=1
+  MOZ_LDAP_XPCOM=1
+  MOZ_COMPOSER=1
+  MOZ_PROFILESHARING=1
+  MOZ_APP_VERSION=$MOZILLA_VERSION
+  ;;
+
+browser)
+  MOZ_APP_NAME=firefox
+  MOZ_XUL_APP=1
+  MOZ_PHOENIX=1
+  MOZ_APP_VERSION=`cat $topsrcdir/browser/config/version.txt`
+  AC_DEFINE(MOZ_PHOENIX)
+  ;;
+
+mail)
+  MOZ_APP_NAME=thunderbird
+  MOZ_XUL_APP=1
+  MOZ_THUNDERBIRD=1
+  MOZ_MAIL_NEWS=1
+  MOZ_LDAP_XPCOM=1
+  MOZ_STATIC_MAIL_BUILD=1
+  MOZ_COMPOSER=1
+  MOZ_APP_VERSION=`cat $topsrcdir/mail/config/version.txt`
+  AC_DEFINE(MOZ_THUNDERBIRD)
+  ;;
+
+composer)
+  MOZ_APP_NAME=nvu
+  MOZ_XUL_APP=1
+  MOZ_STANDALONE_COMPOSER=1
+  MOZ_COMPOSER=1
+  MOZ_APP_VERSION=0.17+
+  AC_DEFINE(MOZ_STANDALONE_COMPOSER)
+  ;;
+
+calendar)
+  MOZ_APP_NAME=sunbird
+  MOZ_XUL_APP=1
+  MOZ_SUNBIRD=1
+  MOZ_CALENDAR=1
+  MOZ_APP_VERSION=`cat $topsrcdir/calendar/sunbird/config/version.txt`
+  AC_DEFINE(MOZ_SUNBIRD)
+  ;;
+
+xulrunner)
+  MOZ_APP_NAME=xulrunner
+  MOZ_XUL_APP=1
+  MOZ_XULRUNNER=1 
+  MOZ_APP_VERSION=`cat $topsrcdir/xulrunner/config/version.txt`
+  AC_DEFINE(MOZ_XULRUNNER)
+  ;;
+
+macbrowser) 
+  MOZ_APP_NAME=mozilla
+  MOZ_APP_VERSION=$MOZILLA_VERSION
+  ;;
+
+standalone) 
+  MOZ_APP_NAME=mozilla
+  MOZ_APP_VERSION=$MOZILLA_VERSION
+  ;;
+
+*)
+  AC_MSG_ERROR([--enable-application=APP is required])
+  ;;
+
+esac
+
+AC_SUBST(MOZ_BUILD_APP)
+AC_SUBST(MOZ_XUL_APP)
+AC_SUBST(MOZ_PHOENIX)
+AC_SUBST(MOZ_THUNDERBIRD)
+AC_SUBST(MOZ_STANDALONE_COMPOSER)
+AC_SUBST(MOZ_SUNBIRD)
+AC_SUBST(MOZ_XULRUNNER)
+
+AC_DEFINE_UNQUOTED(MOZ_BUILD_APP,$MOZ_BUILD_APP)
+
+if test "$MOZ_XUL_APP"; then
+  MOZ_SINGLE_PROFILE=1
+  MOZ_PROFILESHARING=
+  AC_DEFINE(MOZ_XUL_APP)
+fi
+
 dnl ========================================================
 dnl =
 dnl = Components & Features
@@ -3431,10 +3548,10 @@ AC_SUBST(MOZ_CALENDAR)
 dnl =========================================================
 dnl = Mail & News
 dnl =========================================================
-MOZ_MAIL_NEWS=1
 MOZ_ARG_DISABLE_BOOL(mailnews,
 [  --disable-mailnews      Disable building of mail & news components],
-    MOZ_MAIL_NEWS= )
+    MOZ_MAIL_NEWS=,
+    MOZ_MAIL_NEWS=1 )
 AC_SUBST(MOZ_MAIL_NEWS)
 
 dnl ========================================================
@@ -3454,7 +3571,6 @@ AC_SUBST(MOZ_STATIC_MAIL_BUILD)
 dnl =========================================================
 dnl = LDAP
 dnl =========================================================
-MOZ_LDAP_XPCOM=1
 MOZ_ARG_DISABLE_BOOL(ldap,
 [  --disable-ldap          Disable LDAP support],
     MOZ_LDAP_XPCOM=,
@@ -3489,80 +3605,6 @@ fi
 AC_DEFINE_UNQUOTED(MOZ_DISTRIBUTION_ID,"$MOZ_DISTRIBUTION_ID")
 AC_SUBST(MOZ_DISTRIBUTION_ID)
 
-dnl ========================================================
-dnl = Phoenix
-dnl ========================================================
-MOZ_XUL_APP=
-if test "$MOZ_PHOENIX"; then
-   AC_DEFINE(MOZ_PHOENIX)
-   MOZ_XUL_APP=1
-   AC_DEFINE(MOZ_XUL_APP)
-   MOZ_APP_NAME=firefox
-   MOZ_APP_VERSION=`cat $topsrcdir/browser/config/version.txt`
-fi
-
-AC_SUBST(MOZ_PHOENIX)
-
-dnl ========================================================
-dnl = XUL Runner
-dnl ========================================================
-if test "$MOZ_XULRUNNER"; then
-   AC_DEFINE(MOZ_XULRUNNER)
-   MOZ_XUL_APP=1
-   AC_DEFINE(MOZ_XUL_APP)
-   MOZ_APP_NAME=xulrunner
-   MOZ_APP_VERSION=`cat $topsrcdir/xulrunner/config/version.txt`
-fi
-
-AC_SUBST(MOZ_XULRUNNER)
-
-dnl ========================================================
-dnl = Thunderbird
-dnl ========================================================
-if test "$MOZ_THUNDERBIRD"; then
-   AC_DEFINE(MOZ_THUNDERBIRD)
-
-   MOZ_STATIC_MAIL_BUILD=1
-   AC_DEFINE(MOZ_STATIC_MAIL_BUILD)
-   
-   MOZ_XUL_APP=1
-   AC_DEFINE(MOZ_XUL_APP)
-   MOZ_APP_NAME=thunderbird
-   MOZ_APP_VERSION=`cat $topsrcdir/mail/config/version.txt`
-fi
-
-AC_SUBST(MOZ_THUNDERBIRD)
-
-dnl ========================================================
-dnl = Standalone Composer
-dnl ========================================================
-if test "$MOZ_STANDALONE_COMPOSER"; then
-   AC_DEFINE(MOZ_STANDALONE_COMPOSER)
-   
-   MOZ_XUL_APP=1
-   AC_DEFINE(MOZ_XUL_APP)
-   MOZ_APP_NAME=nvu
-   MOZ_APP_VERSION=0.17+
-fi
-
-AC_SUBST(MOZ_STANDALONE_COMPOSER)
-
-dnl ========================================================
-dnl = Sunbird
-dnl ========================================================
-if test "$MOZ_SUNBIRD"; then
-   AC_DEFINE(MOZ_SUNBIRD)
-
-   MOZ_XUL_APP=1
-   AC_DEFINE(MOZ_XUL_APP)
-   MOZ_APP_NAME=sunbird
-   MOZ_APP_VERSION=`cat $topsrcdir/calendar/sunbird/config/version.txt`
-fi
-
-AC_SUBST(MOZ_SUNBIRD)
-AC_SUBST(MOZ_XUL_APP)
-AC_DEFINE_UNQUOTED(MOZ_APP_NAME, "$MOZ_APP_NAME")
-
 dnl ========================================================
 dnl = FreeType2
 dnl = Enable freetype by default if building against X11 
@@ -3937,7 +3979,6 @@ fi
 dnl ========================================================
 dnl Single profile support off by default
 dnl ========================================================
-MOZ_SINGLE_PROFILE=
 MOZ_ARG_ENABLE_BOOL(single-profile,
 [  --enable-single-profile Enable single profile support ],
     MOZ_SINGLE_PROFILE=1,
@@ -3987,7 +4028,6 @@ AC_SUBST(MOZ_PLAINTEXT_EDITOR_ONLY)
 dnl ========================================================
 dnl Composer is on by default.
 dnl ========================================================
-MOZ_COMPOSER=1
 MOZ_ARG_DISABLE_BOOL(composer,
 [  --disable-composer      Disable building of Composer],
     MOZ_COMPOSER=,
@@ -5475,38 +5515,30 @@ MOZ_LIBART_CFLAGS=
 MOZ_LIBART_LIBS=
 
 if test "$MOZ_SVG_RENDERER_LIBART"; then
-  if test "$MOZ_INTERNAL_LIBART_LGPL"; then
-    dnl libart's configure hasn't been run yet, but we know what the
-    dnl answer should be anyway
-    MOZ_LIBART_CFLAGS='-I${DIST}/include/libart_lgpl'
-    case "$target_os" in
-    msvc*|mks*|cygwin*|mingw*)
-        MOZ_LIBART_LIBS='$(DIST)/lib/$(LIB_PREFIX)moz_art_lgpl.$(IMPORT_LIB_SUFFIX)' 
-        ;;
-    beos*)
-        MOZ_LIBART_LIBS='-lmoz_art_lgpl -lroot -lbe'
-        ;;
-    *)
-        MOZ_LIBART_LIBS='-lmoz_art_lgpl -lm'
-        ;;
-    esac
-    AC_FUNC_ALLOCA
-  else
-dnl Disable system libart until the pixel format changes are merged upstream
-    AC_MSG_ERROR([SVG requires a modified version of libart. To pull and build
-this LGPL library, set MOZ_INTERNAL_LIBART_LGPL, and then rerun the
-checkout stage])
-dnl    AM_PATH_LIBART($LIBART_VERSION,
-dnl      AC_MSG_ERROR(SVG requires at least version $LIBART_VERSION of libart))
-dnl
-dnl    MOZ_LIBART_CFLAGS=$LIBART_CFLAGS
-dnl    MOZ_LIBART_LIBS=$LIBART_LIBS
+  if test ! -f $topsrcdir/other-licenses/libart_lgpl/Makefile.in; then
+    AC_MSG_ERROR([You must check out the mozilla version of libart. Use
+mk_add_options MOZ_CO_MODULE=mozilla/other-licenses/libart_lgpl])
   fi
+
+  dnl libart's configure hasn't been run yet, but we know what the
+  dnl answer should be anyway
+  MOZ_LIBART_CFLAGS='-I${DIST}/include/libart_lgpl'
+  case "$target_os" in
+  msvc*|mks*|cygwin*|mingw*)
+      MOZ_LIBART_LIBS='$(DIST)/lib/$(LIB_PREFIX)moz_art_lgpl.$(IMPORT_LIB_SUFFIX)' 
+      ;;
+  beos*)
+      MOZ_LIBART_LIBS='-lmoz_art_lgpl -lroot -lbe'
+      ;;
+  *)
+      MOZ_LIBART_LIBS='-lmoz_art_lgpl -lm'
+      ;;
+  esac
+  AC_FUNC_ALLOCA
 fi
 
 AC_SUBST(MOZ_LIBART_CFLAGS)
 AC_SUBST(MOZ_LIBART_LIBS)
-AC_SUBST(MOZ_INTERNAL_LIBART_LGPL)
 
 dnl ========================================================
 dnl Check for cairo
@@ -5542,8 +5574,6 @@ AC_SUBST(MOZ_XUL)
 dnl ========================================================
 dnl disable profile sharing
 dnl ========================================================
-MOZ_PROFILESHARING=1
-MOZ_IPCD=
 MOZ_ARG_DISABLE_BOOL(profilesharing,
 [  --disable-profilesharing           Disable profile sharing],
     MOZ_PROFILESHARING=,
@@ -5558,7 +5588,6 @@ dnl disable profile locking
 dnl   do no use this in applications that can have more than
 dnl   one process accessing the profile directory.
 dnl ========================================================
-MOZ_PROFILELOCKING=1
 MOZ_ARG_DISABLE_BOOL(profilelocking,
 [  --disable-profilelocking           Disable profile locking],
     MOZ_PROFILELOCKING=,
diff --git a/mail/config/mozconfig b/mail/config/mozconfig
index dbd7c6899f8..f832db8d773 100644
--- a/mail/config/mozconfig
+++ b/mail/config/mozconfig
@@ -3,9 +3,8 @@
 #  . $topsrcdir/mail/config/mozconfig
 # to the top of your mozconfig file.
 
-MOZ_THUNDERBIRD=1
-export MOZ_THUNDERBIRD
-mk_add_options MOZ_THUNDERBIRD=1
+mk_add_options MOZ_CO_PROJECT=mail
+ac_add_options --enable-application=mail
 
 ac_add_options --enable-crypto
 ac_add_options --disable-mathml
@@ -14,8 +13,6 @@ ac_add_options --disable-activex-scripting
 ac_add_options --disable-tests
 ac_add_options --disable-oji
 ac_add_options --disable-necko-disk-cache
-ac_add_options --enable-single-profile
-ac_add_options --disable-profilesharing
 ac_add_options --enable-extensions=wallet,spellcheck,xmlextras,webservices
 ac_add_options --enable-necko-protocols=http,file,jar,viewsource,res,data
 ac_add_options --enable-image-decoders=default,-xbm
diff --git a/xpfe/bootstrap/nsAppRunner.cpp b/xpfe/bootstrap/nsAppRunner.cpp
index 960da825696..a46824e9b09 100644
--- a/xpfe/bootstrap/nsAppRunner.cpp
+++ b/xpfe/bootstrap/nsAppRunner.cpp
@@ -151,6 +151,8 @@ extern "C" void ShowOSAlert(const char* aMessage);
 #include "jprof.h"
 #endif
 
+#define MOZ_APP_NAME "mozilla"
+
 // on x86 linux, the current builds of some popular plugins (notably
 // flashplayer and real) expect a few builtin symbols from libgcc
 // which were available in some older versions of gcc.  However,
diff --git a/xulrunner/config/mozconfig b/xulrunner/config/mozconfig
index 04a4bdcdda4..33a9470da05 100644
--- a/xulrunner/config/mozconfig
+++ b/xulrunner/config/mozconfig
@@ -3,13 +3,8 @@
 #  . $topsrcdir/xulrunner/config/mozconfig
 # to the top of your mozconfig file.
 
-export MOZ_XULRUNNER=1
-mk_add_options MOZ_XULRUNNER=1
+mk_add_options MOZ_CO_PROJECT=xulrunner
+ac_add_options --enable-application=xulrunner
 
-ac_add_options --disable-ldap
-ac_add_options --disable-mailnews
 ac_add_options --enable-extensions=xml-rpc,xmlextras,pref,transformiix,universalchardet,webservices,gnomevfs,negotiateauth
 ac_add_options --enable-crypto
-ac_add_options --disable-composer
-ac_add_options --enable-single-profile
-ac_add_options --disable-profilesharing