summaryrefslogtreecommitdiffstats
path: root/scp2/InstallScript_setup_osl.mk
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 /scp2/InstallScript_setup_osl.mk
parentno need for Library_regactivex in --disable-activex build (diff)
downloadcore-b6fc0ac84ce68586393784713693cc6b658a2785.tar.gz
core-b6fc0ac84ce68586393784713693cc6b658a2785.zip
remove WITH_ACTIVEX_COMPONENT
Change-Id: I3320b3ce3307598a479dfac5b120e85441c670dc
Diffstat (limited to 'scp2/InstallScript_setup_osl.mk')
-rw-r--r--scp2/InstallScript_setup_osl.mk2
1 files changed, 1 insertions, 1 deletions
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)),\