Enable password manager for sunbird

bug 258524, r=bsmedberg, mostafah

toolkit/components/Makefile.in

@@ -48,9 +48,6 @@ else
 ifdef MOZ_STANDALONE_COMPOSER
 DIRS = console filepicker printing viewsource
 else
-ifdef MOZ_SUNBIRD
-DIRS = autocomplete console filepicker help printing passwordmgr
-else
 DIRS = 		\
 	autocomplete \
 	console \
@@ -70,7 +67,6 @@ endif
 
 DIRS += downloads
 
-endif
 endif
 endif
 

toolkit/components/build/Makefile.in

@@ -85,7 +85,7 @@ SHARED_LIBRARY_LIBS = \
 	../startup/src/$(LIB_PREFIX)appstartup_s.$(LIB_SUFFIX) \
 	$(NULL)
 
-ifdef MOZ_PHOENIX
+ifneq (,$(MOZ_PHOENIX)($MOZ_SUNBIRD))
 SHARED_LIBRARY_LIBS += \
 		$(DIST)/lib/$(LIB_PREFIX)autocomplete_s.$(LIB_SUFFIX) \
 		$(DIST)/lib/$(LIB_PREFIX)download_s.$(LIB_SUFFIX) \

toolkit/components/build/nsModule.cpp

@@ -41,7 +41,7 @@
 #include "nsCommandLineService.h"
 #include "nsXPFEComponentsCID.h"
 
-#ifdef MOZ_PHOENIX
+#if defined(MOZ_PHOENIX) || defined(MOZ_SUNBIRD)
 #ifdef XP_WIN
 #include "nsAlertsService.h"
 #endif
@@ -64,7 +64,7 @@ NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsAppStartup, Init)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsUserInfo)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsCmdLineService)
 
-#ifdef MOZ_PHOENIX
+#if defined(MOZ_PHOENIX) || defined(MOZ_SUNBIRD)
 #ifdef XP_WIN
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsAlertsService)
 #endif
@@ -109,7 +109,7 @@ static const nsModuleComponentInfo components[] =
     NS_COMMANDLINESERVICE_CONTRACTID,
     nsCmdLineServiceConstructor },
 
-#ifdef MOZ_PHOENIX
+#if defined(MOZ_PHOENIX) || defined(MOZ_SUNBIRD)
 #ifdef XP_WIN
   { "Alerts Service",
     NS_ALERTSSERVICE_CID, 

xpfe/Makefile.in

@@ -52,8 +52,11 @@ DIRS += \
         browser/src \
         $(NULL)
 else
+ifdef MOZ_SUNBIRD
+else
 DIRS += browser components/shistory communicator global
 endif
+endif
 
 # Because of our great use of encapsulation, there are
 # some header file in xpfe/components that are required

xpfe/components/Makefile.in

@@ -63,6 +63,8 @@ ifneq (,$(MOZ_PHOENIX)$(MOZ_XULRUNNER))
 DEFINES += SUPPRESS_CHROME
 endif
 
+ifndef MOZ_SUNBIRD
+
 ifdef MOZ_HAVE_BROWSER
 DIRS	= \
 			directory \
@@ -140,5 +142,18 @@ else
 DIRS		+= build2
 endif
 
+else
+# MOZ_SUNBIRD
+DIRS    = \
+                console \
+                filepicker \
+                $(NULL)
+
+ifdef MOZ_ENABLE_XREMOTE
+DIRS		+= xremote
+endif
+
+endif
+
 include $(topsrcdir)/config/rules.mk