From 53ff6edcf54388f556c698d1657abcc2aec69ffa Mon Sep 17 00:00:00 2001
From: Matheus Kerschbaum <matjk7@gmail.com>
Date: Wed, 22 Jun 2011 11:57:27 -0400
Subject: [PATCH] Bug 662023 - Remove ActiveX embedding API part 1: remove
 support from the build system. r=bsmedberg

--HG--
extra : rebase_source : d05e2577581e76b2eedf348f5840e40619eaf4c2
---
 config/autoconf.mk.in         |  2 --
 configure.in                  | 36 -----------------------------------
 embedding/browser/Makefile.in |  6 ------
 toolkit/toolkit-makefiles.sh  |  5 -----
 xulrunner/build.mk            | 12 ------------
 5 files changed, 61 deletions(-)

diff --git a/config/autoconf.mk.in b/config/autoconf.mk.in
index 1366bdad0f2..220d3e2cc03 100644
--- a/config/autoconf.mk.in
+++ b/config/autoconf.mk.in
@@ -135,8 +135,6 @@ MOZ_INSTALLER	= @MOZ_INSTALLER@
 MOZ_UPDATER	= @MOZ_UPDATER@
 MOZ_UPDATE_CHANNEL	= @MOZ_UPDATE_CHANNEL@
 MOZ_UPDATE_PACKAGING	= @MOZ_UPDATE_PACKAGING@
-MOZ_NO_ACTIVEX_SUPPORT = @MOZ_NO_ACTIVEX_SUPPORT@
-MOZ_ACTIVEX_SCRIPTING_SUPPORT = @MOZ_ACTIVEX_SCRIPTING_SUPPORT@
 MOZ_DISABLE_PARENTAL_CONTROLS = @MOZ_DISABLE_PARENTAL_CONTROLS@
 NS_ENABLE_TSF = @NS_ENABLE_TSF@
 MOZ_SPELLCHECK = @MOZ_SPELLCHECK@
diff --git a/configure.in b/configure.in
index e05918f6133..7848087cde7 100644
--- a/configure.in
+++ b/configure.in
@@ -4745,7 +4745,6 @@ dnl ========================================================
 MOZ_ARG_HEADER(Application)
 
 ENABLE_TESTS=1
-MOZ_ACTIVEX_SCRIPTING_SUPPORT=
 MOZ_BRANDING_DIRECTORY=
 MOZ_OFFICIAL_BRANDING=
 MOZ_FEEDS=1
@@ -4754,7 +4753,6 @@ MOZ_JSDEBUGGER=1
 MOZ_MORK=
 MOZ_MORKREADER=1
 MOZ_AUTH_EXTENSION=1
-MOZ_NO_ACTIVEX_SUPPORT=1
 MOZ_OGG=1
 MOZ_RAW=
 MOZ_SYDNEYAUDIO=
@@ -6476,40 +6474,6 @@ MOZ_ARG_ENABLE_BOOL(update-packaging,
     MOZ_UPDATE_PACKAGING= )
 AC_SUBST(MOZ_UPDATE_PACKAGING)
 
-dnl ========================================================
-dnl ActiveX
-dnl ========================================================
-
-MOZ_ARG_DISABLE_BOOL(activex,
-[  --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_ARG_ENABLE_BOOL(activex-scripting,
-[  --enable-activex-scripting
-                          Enable building of ActiveX scripting support (win32)],
-    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
-
-if test "$COMPILE_ENVIRONMENT" = "1"; then
-if test -n "$MOZ_ACTIVEX_SCRIPTING_SUPPORT" -o -z "$MOZ_NO_ACTIVEX_SUPPORT"; then
-case "$target" in
-*-mingw*)
-    if test "$ac_cv_header_atlbase_h" = "no"; then
-        AC_MSG_ERROR([System header atlbase.h is not available. See http://developer.mozilla.org/en/docs/atlbase.h for details on fixing this problem.])
-    fi
-    ;;
-esac
-fi
-fi
-
 dnl ========================================================
 dnl leaky
 dnl ========================================================
diff --git a/embedding/browser/Makefile.in b/embedding/browser/Makefile.in
index 72130b61e64..e4bd9d09deb 100644
--- a/embedding/browser/Makefile.in
+++ b/embedding/browser/Makefile.in
@@ -45,10 +45,4 @@ include $(DEPTH)/config/autoconf.mk
 
 DIRS = webBrowser build
 
-ifeq ($(OS_ARCH),WINNT)
-ifndef MOZ_NO_ACTIVEX_SUPPORT
-TOOL_DIRS += activex/src
-endif
-endif
-
 include $(topsrcdir)/config/rules.mk
diff --git a/toolkit/toolkit-makefiles.sh b/toolkit/toolkit-makefiles.sh
index 0713273c501..9f14040398b 100644
--- a/toolkit/toolkit-makefiles.sh
+++ b/toolkit/toolkit-makefiles.sh
@@ -558,11 +558,6 @@ MAKEFILES_embedding="
   embedding/Makefile
   embedding/base/Makefile
   embedding/browser/Makefile
-  embedding/browser/activex/src/Makefile
-  embedding/browser/activex/src/common/Makefile
-  embedding/browser/activex/src/control/Makefile
-  embedding/browser/activex/src/control_kicker/Makefile
-  embedding/browser/activex/src/plugin/Makefile
   embedding/browser/build/Makefile
   embedding/browser/webBrowser/Makefile
   embedding/components/Makefile
diff --git a/xulrunner/build.mk b/xulrunner/build.mk
index b4f7e735586..2a67ab0be27 100644
--- a/xulrunner/build.mk
+++ b/xulrunner/build.mk
@@ -43,18 +43,6 @@ ifdef MOZ_EXTENSIONS
 tier_app_dirs += extensions
 endif
 
-# axcontrol
-ifndef LIBXUL_SDK
-ifeq ($(OS_ARCH),WINNT)
-ifndef MOZ_NO_ACTIVEX_SUPPORT
-tier_app_dirs += \
-		embedding/browser/activex/src/control \
-		embedding/browser/activex/src/control_kicker \
-		$(NULL)
-endif # MOZ_NO_ACTIVEX_SUPPORT
-endif # WINNT
-endif # LIBXUL_SDK
-
 # winembed, mfcembed
 ifeq ($(OS_ARCH),WINNT)
 ifneq (,$(ENABLE_TESTS)$(MOZILLA_OFFICIAL))