wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 662023 - Remove ActiveX embedding API part 1: remove support from the build system. r=bsmedberg

Browse Source 
--HG--
extra : rebase_source : d05e2577581e76b2eedf348f5840e40619eaf4c2
This commit is contained in:
Matheus Kerschbaum 2011-06-22 11:57:27 -04:00
parent 5440d51057
commit 53ff6edcf5
5 changed files with 0 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/autoconf.mk.in
View File

@ -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@

36
configure.in
View File

@ -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 ========================================================

6
embedding/browser/Makefile.in
View File

@ -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

5
toolkit/toolkit-makefiles.sh
View File

@ -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

12
xulrunner/build.mk
View File

@ -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))