Bug 549293 - Port MOZ_IPC support to comm-central; (Av1a) Just copy (the useful part of) it.
authorSerge Gautherie <sgautherie.bz@free.fr>
Sat, 13 Mar 2010 16:06:44 +0100
changeset 5167 eca0ae9a63220940f6ef4b987b922f8fd4b8de25
parent 5166 34948b9a20168026f9207a778dc6454704032f5b
child 5168 89a8752677ffa8aede5a33bb305ddf3cc5f681cd
push idunknown
push userunknown
push dateunknown
bugs549293, 523097, 515748
Bug 549293 - Port MOZ_IPC support to comm-central; (Av1a) Just copy (the useful part of) it. r=Callek. changeset fc6ed914e44e changeset 11c34494c1f3 changeset 29cce68477c5 changeset 489e7d993d34 Bug 523097 - Turn off MOZ_IPC for platforms where we currently don't build, and fix up ifdefs so that everything builds WinMo bustage: Electrolysis doesn't have WinMo tinderboxes and we had a silent code race with bug 515748 changeset 848a7cf64d03
config/autoconf.mk.in
configure.in
--- a/config/autoconf.mk.in
+++ b/config/autoconf.mk.in
@@ -91,16 +91,19 @@ MOZ_DEBUG	= @MOZ_DEBUG@
 MOZ_DEBUG_MODULES = @MOZ_DEBUG_MODULES@
 MOZ_PROFILE_MODULES = @MOZ_PROFILE_MODULES@
 MOZ_DEBUG_ENABLE_DEFS		= @MOZ_DEBUG_ENABLE_DEFS@
 MOZ_DEBUG_DISABLE_DEFS	= @MOZ_DEBUG_DISABLE_DEFS@
 MOZ_DEBUG_FLAGS	= @MOZ_DEBUG_FLAGS@
 MOZ_DEBUG_LDFLAGS=@MOZ_DEBUG_LDFLAGS@
 MOZ_DBGRINFO_MODULES	= @MOZ_DBGRINFO_MODULES@
 MOZ_JSDEBUGGER  = @MOZ_JSDEBUGGER@
+ifndef MOZILLA_1_9_2_BRANCH
+MOZ_IPC 	= @MOZ_IPC@
+endif
 MOZ_MEMORY      = @MOZ_MEMORY@
 MOZ_JPROF       = @MOZ_JPROF@
 MOZ_SHARK       = @MOZ_SHARK@
 DEHYDRA_PATH    = @DEHYDRA_PATH@
 
 ENABLE_EAZEL_PROFILER=@ENABLE_EAZEL_PROFILER@
 EAZEL_PROFILER_CFLAGS=@EAZEL_PROFILER_CFLAGS@
 EAZEL_PROFILER_LIBS=@EAZEL_PROFILER_LIBS@
--- a/configure.in
+++ b/configure.in
@@ -508,21 +508,26 @@ fi
 
 dnl Special win32 checks
 dnl ========================================================
 case "$target" in
 *-wince)
     WINVER=500
     ;;
 *)
+if test "$MOZILLA_1_9_2_BRANCH" = "1"; then
     if test -n "$GNU_CC"; then  
         WINVER=501
     else    
         WINVER=500
     fi
+else
+    WINVER=502
+fi
+
     ;;
 esac
 
 dnl Target the Windows 7 SDK by default
 WINSDK_TARGETVER=601
 
 MOZ_ARG_WITH_STRING(windows-version,
 [  --with-windows-version=WINSDK_TARGETVER
@@ -4491,16 +4496,19 @@ dnl ====================================
 MOZ_ARG_HEADER(Application)
 
 BUILD_STATIC_LIBS=
 ENABLE_TESTS=1
 MOZ_BRANDING_DIRECTORY=
 MOZ_CALENDAR=
 MOZ_DBGRINFO_MODULES=
 MOZ_FEEDS=1
+if test "$MOZILLA_1_9_2_BRANCH" != "1"; then
+MOZ_IPC=1
+fi
 MOZ_JSDEBUGGER=1
 MOZ_JSLOADER=1
 MOZ_LDAP_XPCOM=
 MOZ_MAIL_NEWS=
 MOZ_MORK=1
 MOZ_MORKREADER=
 MOZ_AUTH_EXTENSION=1
 MOZ_NO_ACTIVEX_SUPPORT=1
@@ -5177,16 +5185,40 @@ MOZ_ARG_DISABLE_BOOL(crypto,
 dnl ========================================================
 dnl = JS Debugger XPCOM component (js/jsd)
 dnl ========================================================
 MOZ_ARG_DISABLE_BOOL(jsd,
 [  --disable-jsd           Disable JavaScript debug library],
     MOZ_JSDEBUGGER=,
     MOZ_JSDEBUGGER=1)
 
+if test "$MOZILLA_1_9_2_BRANCH" != "1"; then
+dnl ========================================================
+dnl = Disable IPC support for tabs and plugins
+dnl ========================================================
+case "${target}" in
+*-apple-darwin*)
+    MOZ_IPC=
+    ;;
+*-wince*)
+    MOZ_IPC=
+    ;;
+esac
+
+MOZ_ARG_DISABLE_BOOL(ipc,
+[  --disable-ipc           Disable IPC supports for tabs and plugins],
+    MOZ_IPC=,
+    MOZ_IPC=1)
+
+if test -n "$MOZ_IPC"; then
+    AC_DEFINE(MOZ_IPC)
+fi
+
+AC_SUBST(MOZ_IPC)
+fi # ! MOZILLA_1_9_2_BRANCH
 
 dnl ========================================================
 dnl = Disable plugin support
 dnl ========================================================
 MOZ_ARG_DISABLE_BOOL(plugins,
 [  --disable-plugins       Disable plugins support],
     MOZ_PLUGINS=,
     MOZ_PLUGINS=1)
@@ -6733,16 +6765,20 @@ MOZ_ARG_ENABLE_BOOL(libxul,
 if test -n "$MOZ_STATIC_BUILD_UNSUPPORTED" -a -n "$BUILD_STATIC_LIBS"; then
 	AC_MSG_ERROR([--enable-static is not supported for building $MOZ_APP_NAME. You probably want --enable-libxul.])
 fi
 
 if test -n "$MOZ_ENABLE_LIBXUL" -a -n "$BUILD_STATIC_LIBS"; then
 	AC_MSG_ERROR([--enable-libxul is not compatible with --enable-static])
 fi
 
+if test -n "$MOZ_IPC" -a -z "$MOZ_ENABLE_LIBXUL"; then
+    AC_MSG_ERROR([--enable-ipc requires --enable-libxul])
+fi
+
 if test -n "$MOZ_ENABLE_LIBXUL"; then
     XPCOM_LIBS="$LIBXUL_LIBS"
     AC_DEFINE(MOZ_ENABLE_LIBXUL)
 else
     if test -n "$BUILD_STATIC_LIBS"; then
         AC_DEFINE(MOZ_STATIC_BUILD)
     fi
     XPCOM_LIBS="$DYNAMIC_XPCOM_LIBS"