From 4e646a5de3da858c61d69578227d106f14644f00 Mon Sep 17 00:00:00 2001
From: "ccarlen%netscape.com"
 <ccarlen%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Fri, 2 May 2003 03:57:15 +0000
Subject: [PATCH] Profile sharing - enable in build, add autoconf switches,
 pull ipc module. bug=202474, r=seawood/a=asa

git-svn-id: svn://10.0.0.236/trunk@142040 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/Makefile.in           |  4 ++++
 mozilla/allmakefiles.sh       | 43 +++++++++++++++++++++++++++++++++++
 mozilla/client.mk             | 15 ++++++++++++
 mozilla/config/autoconf.mk.in |  2 ++
 4 files changed, 64 insertions(+)

diff --git a/mozilla/Makefile.in b/mozilla/Makefile.in
index 1356e8825d0..ef3740f3c18 100644
--- a/mozilla/Makefile.in
+++ b/mozilla/Makefile.in
@@ -167,6 +167,10 @@ ifdef MOZ_ENABLE_GTK2
 tier_9_dirs     += widget/src/gtkxtbin
 endif
 
+ifdef MOZ_IPCD
+tier_9_dirs += ipc/ipcd
+endif
+
 tier_9_dirs	+= \
 		modules/libutil \
 		netwerk \
diff --git a/mozilla/allmakefiles.sh b/mozilla/allmakefiles.sh
index 02559dd5ef7..5c7fc612bcc 100755
--- a/mozilla/allmakefiles.sh
+++ b/mozilla/allmakefiles.sh
@@ -916,6 +916,40 @@ if [ "$MOZ_MAIL_NEWS" ]; then
     fi
 fi
 
+MAKEFILES_ipcd="
+ipc/ipcd/Makefile
+ipc/ipcd/daemon/public/Makefile
+ipc/ipcd/daemon/src/Makefile
+ipc/ipcd/client/public/Makefile
+ipc/ipcd/client/src/Makefile
+ipc/ipcd/shared/src/Makefile
+ipc/ipcd/test/Makefile
+ipc/ipcd/test/module/Makefile
+ipc/ipcd/extensions/Makefile
+ipc/ipcd/extensions/lock/Makefile
+ipc/ipcd/extensions/lock/public/Makefile
+ipc/ipcd/extensions/lock/src/Makefile
+ipc/ipcd/extensions/lock/src/module/Makefile
+ipc/ipcd/util/Makefile
+ipc/ipcd/util/public/Makefile
+ipc/ipcd/util/src/Makefile
+"
+
+MAKEFILES_transmngr="
+ipc/ipcd/extensions/transmngr/Makefile
+ipc/ipcd/extensions/transmngr/public/Makefile
+ipc/ipcd/extensions/transmngr/src/Makefile
+ipc/ipcd/extensions/transmngr/build/Makefile
+ipc/ipcd/extensions/transmngr/test/Makefile
+ipc/ipcd/extensions/transmngr/common/Makefile
+ipc/ipcd/extensions/transmngr/module/Makefile
+"
+
+MAKEFILES_profilesharingsetup="
+embedding/components/profilesharingsetup/Makefile
+embedding/components/profilesharingsetup/public/Makefile
+embedding/components/profilesharingsetup/src/Makefile
+"
 
     MAKEFILES_libpr0n="
         modules/libpr0n/Makefile
@@ -1317,6 +1351,15 @@ if test -n "$MOZ_THUNDERBIRD"; then
     add_makefiles "$MAKEFILES_thunderbird"
 fi
 
+if test -n "$MOZ_IPCD"; then
+    add_makefiles "$MAKEFILES_ipcd"
+fi
+
+if test -n "$MOZ_PROFILESHARING"; then
+    add_makefiles "$MAKEFILES_transmngr"
+    add_makefiles "$MAKEFILES_profilesharingsetup"
+fi
+
 else
 
 # Standalone modules go here
diff --git a/mozilla/client.mk b/mozilla/client.mk
index bbf9c0f6fd2..0f06af72f4c 100644
--- a/mozilla/client.mk
+++ b/mozilla/client.mk
@@ -59,6 +59,7 @@ NSS_CO_TAG = NSS_CLIENT_TAG
 LDAPCSDK_CO_TAG = ldapcsdk_50_client_branch
 ACCESSIBLE_CO_TAG = 
 IMGLIB2_CO_TAG = 
+IPC_CO_TAG = IPC_BRANCH_20030304
 BUILD_MODULES = all
 
 #######################################################################
@@ -280,6 +281,19 @@ ifdef 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
+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 
 #
@@ -467,6 +481,7 @@ real_checkout:
         cvs_co $(CVSCO_LDAPCSDK) && \
         cvs_co $(CVSCO_ACCESSIBLE) && \
         cvs_co $(CVSCO_IMGLIB2) && \
+	cvs_co $(CVSCO_IPC) && \
 	cvs_co $(CVSCO_CALENDAR) && \
 	$(CHECKOUT_LIBART) && \
 	$(CHECKOUT_MOZTOOLKIT) && \
diff --git a/mozilla/config/autoconf.mk.in b/mozilla/config/autoconf.mk.in
index 6ebc71f1f36..9b7268db7c5 100644
--- a/mozilla/config/autoconf.mk.in
+++ b/mozilla/config/autoconf.mk.in
@@ -101,6 +101,8 @@ MOZ_NO_ACTIVEX_SUPPORT = @MOZ_NO_ACTIVEX_SUPPORT@
 MOZ_ACTIVEX_SCRIPTING_SUPPORT = @MOZ_ACTIVEX_SCRIPTING_SUPPORT@
 XPC_IDISPATCH_SUPPORT = @MOZ_ACTIVEX_SCRIPTING_SUPPORT@
 MOZ_XPFE_COMPONENTS = @MOZ_XPFE_COMPONENTS@
+MOZ_IPCD = @MOZ_IPCD@
+MOZ_PROFILESHARING = @MOZ_PROFILESHARING@
 
 MOZ_COMPONENTS_VERSION_SCRIPT_LDFLAGS = @MOZ_COMPONENTS_VERSION_SCRIPT_LDFLAGS@
 MOZ_COMPONENT_NSPR_LIBS=@MOZ_COMPONENT_NSPR_LIBS@