summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatúš Kukan <matus.kukan@gmail.com>2013-09-17 20:28:13 +0200
committerMatúš Kukan <matus.kukan@gmail.com>2013-09-17 20:29:14 +0200
commitb6fc0ac84ce68586393784713693cc6b658a2785 (patch)
treedad9622f1cf116ff4e1dfcda1241e6bcda9b7ccf
parentf3464f5e0918152d8ff1552ed4932523990b2b79 (diff)
remove WITH_ACTIVEX_COMPONENT
Change-Id: I3320b3ce3307598a479dfac5b120e85441c670dc
-rw-r--r--configure.ac1
-rw-r--r--scp2/InstallScript_setup_osl.mk2
-rw-r--r--scp2/Module_scp2.mk2
-rw-r--r--scp2/source/activex/file_activex.scp4
-rw-r--r--scp2/source/activex/module_activex.scp4
5 files changed, 2 insertions, 11 deletions
diff --git a/configure.ac b/configure.ac
index bf78f359fe49..fda58df807cd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3065,7 +3065,6 @@ if test "$_os" = "WINNT" -a "$WITH_MINGW" != yes; then
AC_MSG_CHECKING([whether to use ActiveX])
if test "$enable_activex" = "yes" -o "$enable_activex" = ""; then
DISABLE_ACTIVEX=""
- SCPDEFS="$SCPDEFS -DWITH_ACTIVEX_COMPONENT"
AC_MSG_RESULT([yes])
else
DISABLE_ACTIVEX="TRUE"
diff --git a/scp2/InstallScript_setup_osl.mk b/scp2/InstallScript_setup_osl.mk
index 72c789d99866..75f2a8c2b638 100644
--- a/scp2/InstallScript_setup_osl.mk
+++ b/scp2/InstallScript_setup_osl.mk
@@ -26,7 +26,7 @@ $(eval $(call gb_InstallScript_use_modules,setup_osl,\
scp2/writer \
scp2/xsltfilter \
$(if $(filter WNT,$(OS)),\
- scp2/activex \
+ $(if $(DISABLE_ACTIVEX),,scp2/activex) \
scp2/quickstart \
scp2/windows \
$(if $(filter MSC,$(COM)),\
diff --git a/scp2/Module_scp2.mk b/scp2/Module_scp2.mk
index bd304773d87b..05911c51faa6 100644
--- a/scp2/Module_scp2.mk
+++ b/scp2/Module_scp2.mk
@@ -37,7 +37,7 @@ $(eval $(call gb_Module_add_targets,scp2,\
InstallScript_sdkoo \
) \
$(if $(filter WNT,$(OS)),\
- InstallModule_activex \
+ $(if $(DISABLE_ACTIVEX),,InstallModule_activex) \
InstallModule_quickstart \
InstallModule_windows \
$(if $(filter MSC,$(COM)),\
diff --git a/scp2/source/activex/file_activex.scp b/scp2/source/activex/file_activex.scp
index c710aba67eb4..e6864b83e6b9 100644
--- a/scp2/source/activex/file_activex.scp
+++ b/scp2/source/activex/file_activex.scp
@@ -18,8 +18,6 @@
#include "macros.inc"
-#ifdef WITH_ACTIVEX_COMPONENT
-
File gid_File_Lib_Soactivex
LIB_FILE_BODY;
Styles = (PACKED);
@@ -36,5 +34,3 @@ End
ComponentCondition = "VersionNT64";
End
#endif
-
-#endif // WITH_ACTIVEX_COMPONENT
diff --git a/scp2/source/activex/module_activex.scp b/scp2/source/activex/module_activex.scp
index 78b8954bb694..e56ced78b120 100644
--- a/scp2/source/activex/module_activex.scp
+++ b/scp2/source/activex/module_activex.scp
@@ -19,8 +19,6 @@
#include "macros.inc"
#include "AutoInstall/activexbinarytable"
-#ifdef WITH_ACTIVEX_COMPONENT
-
Module gid_Module_Optional_Activexcontrol
PackageInfo = "packinfo_office.txt";
MOD_NAME_DESC ( MODULE_OPTIONAL_ACTIVEXCONTROL );
@@ -33,5 +31,3 @@ Module gid_Module_Optional_Activexcontrol
gid_File_Lib_Soactivex64,
gid_File_Lib_Regpatchactivex_Msi);
End
-
-#endif // WITH_ACTIVEX_COMPONENT