Bug 462438 - kill MOZ_PROFILESHARING and MOZ_IPCD; r=kairo
--- a/config/autoconf.mk.in
+++ b/config/autoconf.mk.in
@@ -140,18 +140,16 @@ MOZ_UPDATER = @MOZ_UPDATER@
MOZ_UPDATE_PACKAGING = @MOZ_UPDATE_PACKAGING@
MOZ_NO_ACTIVEX_SUPPORT = @MOZ_NO_ACTIVEX_SUPPORT@
MOZ_ACTIVEX_SCRIPTING_SUPPORT = @MOZ_ACTIVEX_SCRIPTING_SUPPORT@
MOZ_DISABLE_VISTA_SDK_REQUIREMENTS = @MOZ_DISABLE_VISTA_SDK_REQUIREMENTS@
MOZ_DISABLE_PARENTAL_CONTROLS = @MOZ_DISABLE_PARENTAL_CONTROLS@
XPC_IDISPATCH_SUPPORT = @XPC_IDISPATCH_SUPPORT@
MOZ_SPELLCHECK = @MOZ_SPELLCHECK@
MOZ_XPFE_COMPONENTS = @MOZ_XPFE_COMPONENTS@
-MOZ_IPCD = @MOZ_IPCD@
-MOZ_PROFILESHARING = @MOZ_PROFILESHARING@
MOZ_PROFILELOCKING = @MOZ_PROFILELOCKING@
MOZ_FEEDS = @MOZ_FEEDS@
MOZ_PLACES = @MOZ_PLACES@
MOZ_PLACES_BOOKMARKS = @MOZ_PLACES_BOOKMARKS@
MOZ_STORAGE = @MOZ_STORAGE@
MOZ_SAFE_BROWSING = @MOZ_SAFE_BROWSING@
MOZ_URL_CLASSIFIER = @MOZ_URL_CLASSIFIER@
MOZ_ZIPWRITER = @MOZ_ZIPWRITER@
--- a/configure.in
+++ b/configure.in
@@ -4267,17 +4267,16 @@ MOZ_ARG_HEADER(Application)
BUILD_STATIC_LIBS=
ENABLE_TESTS=1
MOZ_ACTIVEX_SCRIPTING_SUPPORT=
MOZ_BRANDING_DIRECTORY=
MOZ_CALENDAR=
MOZ_DBGRINFO_MODULES=
MOZ_FEEDS=1
-MOZ_IPCD=
MOZ_JSDEBUGGER=1
MOZ_JSLOADER=1
MOZ_LDAP_XPCOM=
MOZ_LIBART_CFLAGS=
MOZ_LIBART_LIBS=
MOZ_MAIL_NEWS=
MOZ_MORK=1
MOZ_MORKREADER=
@@ -4288,17 +4287,16 @@ MOZ_NO_XPCOM_OBSOLETE=
MOZ_NO_FAST_LOAD=
MOZ_OJI=
MOZ_PERMISSIONS=1
MOZ_PLACES=
MOZ_PLAINTEXT_EDITOR_ONLY=
MOZ_PLUGINS=1
MOZ_PREF_EXTENSIONS=1
MOZ_PROFILELOCKING=1
-MOZ_PROFILESHARING=1
MOZ_PSM=1
MOZ_RDF=1
MOZ_REFLOW_PERF=
MOZ_SAFE_BROWSING=
MOZ_HELP_VIEWER=
MOZ_SPELLCHECK=1
MOZ_STATIC_MAIL_BUILD=
MOZ_STORAGE=1
@@ -4383,17 +4381,16 @@ basic)
MOZ_NO_INSPECTOR_APIS=1
MOZ_NO_XPCOM_OBSOLETE=1
MOZ_NO_FAST_LOAD=1
MOZ_OJI=
MOZ_PLAINTEXT_EDITOR_ONLY=1
# MOZ_PLUGINS=
MOZ_PREF_EXTENSIONS=
MOZ_PROFILELOCKING=
- MOZ_PROFILESHARING=
MOZ_SPELLCHECK=
MOZ_UNIVERSALCHARDET=
MOZ_UPDATER=
MOZ_USE_NATIVE_UCONV=
MOZ_VIEW_SOURCE=
MOZ_XPFE_COMPONENTS=
MOZ_XPINSTALL=
MOZ_XTF=
@@ -4422,17 +4419,16 @@ minimal)
MOZ_NO_INSPECTOR_APIS=1
MOZ_NO_XPCOM_OBSOLETE=1
MOZ_NO_FAST_LOAD=1
MOZ_OJI=
MOZ_PLAINTEXT_EDITOR_ONLY=1
MOZ_PLUGINS=
MOZ_PREF_EXTENSIONS=
MOZ_PROFILELOCKING=
- MOZ_PROFILESHARING=
MOZ_SPELLCHECK=
MOZ_STORAGE=1
MOZ_PLACES=
MOZ_UNIVERSALCHARDET=
MOZ_UPDATER=
MOZ_USE_NATIVE_UCONV=1
MOZ_VIEW_SOURCE=
MOZ_XPFE_COMPONENTS=
@@ -4528,17 +4524,16 @@ AC_SUBST(MOZ_BUILD_APP)
AC_SUBST(MOZ_XUL_APP)
AC_SUBST(MOZ_SUITE)
AC_SUBST(MOZ_THUNDERBIRD)
AC_SUBST(MOZ_SUNBIRD)
AC_DEFINE_UNQUOTED(MOZ_BUILD_APP,$MOZ_BUILD_APP)
if test "$MOZ_XUL_APP"; then
- MOZ_PROFILESHARING=
AC_DEFINE(MOZ_XUL_APP)
fi
dnl ========================================================
dnl =
dnl = Toolkit Options
dnl =
dnl ========================================================
@@ -6986,36 +6981,16 @@ MOZ_ARG_DISABLE_BOOL(xul,
MOZ_XUL= )
if test "$MOZ_XUL"; then
AC_DEFINE(MOZ_XUL)
fi
AC_SUBST(MOZ_XUL)
dnl ========================================================
-dnl disable profile sharing
-dnl ========================================================
-MOZ_ARG_DISABLE_BOOL(profilesharing,
-[ --disable-profilesharing Disable profile sharing],
- MOZ_PROFILESHARING=,
- MOZ_PROFILESHARING=1 )
-if test "$MOZ_PROFILESHARING"; then
- MOZ_IPCD=1
- AC_DEFINE(MOZ_PROFILESHARING)
-fi
-
-dnl ========================================================
-dnl enable ipc/ipcd
-dnl ========================================================
-MOZ_ARG_ENABLE_BOOL(ipcd,
-[ --enable-ipcd Enable IPC daemon],
- MOZ_IPCD=1,
- MOZ_IPCD= )
-
-dnl ========================================================
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_ARG_DISABLE_BOOL(profilelocking,
[ --disable-profilelocking Disable profile locking],
MOZ_PROFILELOCKING=,
MOZ_PROFILELOCKING=1 )
@@ -7139,21 +7114,18 @@ AC_SUBST(LDAP_CFLAGS)
AC_SUBST(LDAP_LIBS)
AC_SUBST(LIBICONV)
AC_SUBST(MOZ_PLACES)
AC_SUBST(MOZ_PLACES_BOOKMARKS)
AC_SUBST(MOZ_STORAGE)
AC_SUBST(MOZ_FEEDS)
AC_SUBST(NS_PRINTING)
-AC_SUBST(MOZ_PROFILESHARING)
AC_SUBST(MOZ_PROFILELOCKING)
-AC_SUBST(MOZ_IPCD)
-
AC_SUBST(HAVE_XIE)
AC_SUBST(MOZ_XIE_LIBS)
AC_SUBST(MOZ_ENABLE_POSTSCRIPT)
AC_SUBST(XPCOM_USE_LEA)
AC_SUBST(BUILD_STATIC_LIBS)
AC_SUBST(MOZ_ENABLE_LIBXUL)
AC_SUBST(ENABLE_TESTS)