Add --enable-activex-scripting switch to configure.in and package changes to include npmozax.dll. b=133818 r/a=seawood@netscape.com

config/autoconf.mk.in

@@ -94,6 +94,8 @@ JS_ULTRASPARC_OPTS = @JS_ULTRASPARC_OPTS@
 MOZ_ENABLE_POSTSCRIPT = @MOZ_ENABLE_POSTSCRIPT@
 MOZ_INSTALLER	= @MOZ_INSTALLER@
 MOZ_NO_ACTIVEX_SUPPORT = @MOZ_NO_ACTIVEX_SUPPORT@
+MOZ_ACTIVEX_SCRIPTING_SUPPORT = @MOZ_ACTIVEX_SCRIPTING_SUPPORT@
+XPC_IDISPATCH_SUPPORT = @MOZ_ACTIVEX_SCRIPTING_SUPPORT@
 
 MOZ_COMPONENTS_VERSION_SCRIPT_LDFLAGS = @MOZ_COMPONENTS_VERSION_SCRIPT_LDFLAGS@
 MOZ_COMPONENT_NSPR_LIBS=@MOZ_COMPONENT_NSPR_LIBS@

configure.in

@@ -3477,11 +3477,26 @@ case "$target_os" in
 esac
 
 MOZ_ARG_DISABLE_BOOL(activex,
-[  --disable-activex     Disable building of ActiveX (win32 only)],
+[  --disable-activex       Disable building of ActiveX control (win32 only)],
     MOZ_NO_ACTIVEX_SUPPORT=1,
     MOZ_NO_ACTIVEX_SUPPORT= )
 AC_SUBST(MOZ_NO_ACTIVEX_SUPPORT)
 
+MOZ_ACTIVEX_SCRIPTING_SUPPORT=
+MOZ_ARG_ENABLE_BOOL(activex-scripting,
+[  --enable-activex-scripting
+                          Enable building of ActiveX scripting and plugin support (win32 only)],
+    MOZ_ACTIVEX_SCRIPTING_SUPPORT=1,
+    MOZ_ACTIVEX_SCRIPTING_SUPPORT=)
+AC_SUBST(MOZ_ACTIVEX_SCRIPTING_SUPPORT)
+
+
+if test -n "$MOZ_NO_ACTIVEX_SUPPORT" -a -n "$MOZ_ACTIVEX_SCRIPTING_SUPPORT";
+then
+    AC_MSG_ERROR([Cannot enable ActiveX scripting support when ActiveX support is disabled.])
+fi
+
+
 dnl ========================================================
 dnl build the tests by default
 dnl ========================================================

embedding/browser/activex/src/Makefile.in

@@ -26,4 +26,8 @@ include $(DEPTH)/config/autoconf.mk
 
 DIRS=control control_kicker
 
+ifdef MOZ_ACTIVEX_SCRIPTING_SUPPORT
+DIRS += plugin
+endif
+
 include $(topsrcdir)/config/rules.mk

embedding/config/basebrowser-win

@@ -22,6 +22,10 @@
 mozctl.dll
 mozctlx.dll
 
+;
+; ActiveX plugin
+;
+plugins\npmozax.dll
 
 ; 
 ; NSPR:

xpinstall/packager/packages-static-win

@@ -64,6 +64,9 @@ bin\res\cmessage.txt
 bin\regxpcom.exe
 bin\xpicleanup.exe
 
+; ActiveX plugin
+bin\plugins\npmozax.dll
+
 ; LDAP components need to be in the browser for AutoConfig
 bin\nsldap32v50.dll
 bin\nsldappr32v50.dll

xpinstall/packager/packages-win

@@ -251,6 +251,8 @@ bin\ISimpleDOMDocumentMarshal.dll
 bin\components\nsSetDefaultBrowser.js
 bin\components\typeaheadfind.xpt
 bin\components\typeaheadfind.dll
+; ActiveX plugin
+bin\plugins\npmozax.dll
 
 ; LDAP components need to be in the browser for AutoConfig
 bin\components\mozldap.dll