From 35899bf91abc3fefe0693baab742e55d5d9c5187 Mon Sep 17 00:00:00 2001 From: "benjamin%smedbergs.us" Date: Tue, 7 Feb 2006 17:55:16 +0000 Subject: [PATCH] Bug 324939 - --disable-activex-scripting does two entirely different things; add --disable-xpconnect-idispatch to control xpconnect features, --disable-activex-scripting controls the activex plugin, r=shaver --- config/autoconf.mk.in | 2 +- configure.in | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/config/autoconf.mk.in b/config/autoconf.mk.in index 15504f3d3e78..2e8267372a9a 100644 --- a/config/autoconf.mk.in +++ b/config/autoconf.mk.in @@ -138,7 +138,7 @@ 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@ -XPC_IDISPATCH_SUPPORT = @MOZ_ACTIVEX_SCRIPTING_SUPPORT@ +XPC_IDISPATCH_SUPPORT = @XPC_IDISPATCH_SUPPORT@ MOZ_XPFE_COMPONENTS = @MOZ_XPFE_COMPONENTS@ MOZ_IPCD = @MOZ_IPCD@ MOZ_PROFILESHARING = @MOZ_PROFILESHARING@ diff --git a/configure.in b/configure.in index 141c8042a4fe..061d977dd1fd 100644 --- a/configure.in +++ b/configure.in @@ -4225,10 +4225,12 @@ NECKO_PROTOCOLS_DEFAULT="about data file ftp gopher http keyword res viewsource" NECKO_SMALL_BUFFERS= SUNCTL= JS_STATIC_BUILD= +XPC_IDISPATCH_SUPPORT= case "$target_os" in msvc*|mks*|cygwin*|mingw*) if test -z "$GNU_CC"; then + XPC_IDISPATCH_SUPPORT=1 MOZ_NO_ACTIVEX_SUPPORT= MOZ_ACTIVEX_SCRIPTING_SUPPORT=1 fi @@ -5431,6 +5433,15 @@ AC_SUBST(MOZ_UPDATE_PACKAGING) dnl ======================================================== dnl ActiveX dnl ======================================================== + +MOZ_ARG_DISABLE_BOOL(xpconnect-idispatch, +[ --disable-xpconnect-idispatch + Disable building of xpconnect support for IDispatch + (win32 only)], + XPC_IDISPATCH_SUPPORT=, + XPC_IDISPATCH_SUPPORT=1) +AC_SUBST(XPC_IDISPATCH_SUPPORT) + MOZ_ARG_DISABLE_BOOL(activex, [ --disable-activex Disable building of ActiveX control (win32 only)], MOZ_NO_ACTIVEX_SUPPORT=1,