From 4abec2044ca27c897c695317ba3c4459e4aeaa9a Mon Sep 17 00:00:00 2001
From: "mvl%exedo.nl" <mvl%exedo.nl@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Sun, 28 Nov 2004 10:39:16 +0000
Subject: [PATCH] Enable password manager for sunbird bug 258524, r=bsmedberg,
 mostafah

git-svn-id: svn://10.0.0.236/trunk@165846 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/toolkit/components/Makefile.in        |  4 ----
 mozilla/toolkit/components/build/Makefile.in  |  2 +-
 mozilla/toolkit/components/build/nsModule.cpp |  6 +++---
 mozilla/xpfe/Makefile.in                      |  3 +++
 mozilla/xpfe/components/Makefile.in           | 15 +++++++++++++++
 5 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/mozilla/toolkit/components/Makefile.in b/mozilla/toolkit/components/Makefile.in
index 9dfad7c07d6..e1296625ff1 100644
--- a/mozilla/toolkit/components/Makefile.in
+++ b/mozilla/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
 
diff --git a/mozilla/toolkit/components/build/Makefile.in b/mozilla/toolkit/components/build/Makefile.in
index 2f1c23a52ef..328c0cf52c4 100644
--- a/mozilla/toolkit/components/build/Makefile.in
+++ b/mozilla/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) \
diff --git a/mozilla/toolkit/components/build/nsModule.cpp b/mozilla/toolkit/components/build/nsModule.cpp
index cec4e5cee85..881d5bfd606 100644
--- a/mozilla/toolkit/components/build/nsModule.cpp
+++ b/mozilla/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, 
diff --git a/mozilla/xpfe/Makefile.in b/mozilla/xpfe/Makefile.in
index f8467724d81..990fe874359 100644
--- a/mozilla/xpfe/Makefile.in
+++ b/mozilla/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
diff --git a/mozilla/xpfe/components/Makefile.in b/mozilla/xpfe/components/Makefile.in
index 3fe391fa448..2498b68c1b0 100644
--- a/mozilla/xpfe/components/Makefile.in
+++ b/mozilla/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