diff options
| author | Tor Lillqvist <tml@collabora.com> | 2014-10-21 23:21:37 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2014-10-22 09:30:23 +0300 |
| commit | 9ecac3874d179b1d7aa6b45337001b1def06a9dd (patch) | |
| tree | 120fc40fda1055a0f504e60c553b5734030d2741 /solenv | |
| parent | d0be09322d127e7d517851db38c764d57fbab2dc (diff) | |
Replace DISABLE_SCRIPTING with HAVE_FEATURE_SCRIPTING
Feature test macros that govern conditional compilation should be
defined in config_*.h include files, not on the compilation command
line.
Change-Id: I40575a4762fd2564f10927b6f38a112dd9f9a3d7
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/extensions/pre_MergedLibsList.mk | 2 | ||||
| -rw-r--r-- | solenv/gbuild/gbuild.mk | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk b/solenv/gbuild/extensions/pre_MergedLibsList.mk index 859ea8a0da73..8f8320a2336e 100644 --- a/solenv/gbuild/extensions/pre_MergedLibsList.mk +++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk @@ -92,7 +92,7 @@ gb_EXTRAMERGEDLIBS := \ $(call gb_Helper_optional,DESKTOP,unopkgapp) \ unotest \ $(call gb_Helper_optional,DESKTOP,updatefeed) \ - $(if $(DISABLE_SCRIPTING),,vbahelper) \ + $(call gb_Helper_optional,SCRIPTING,vbahelper) \ xmlfa \ xmlfd \ xmlsecurity \ diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk index 52539aeefc28..294c7d18df4b 100644 --- a/solenv/gbuild/gbuild.mk +++ b/solenv/gbuild/gbuild.mk @@ -258,7 +258,6 @@ gb_GLOBALDEFS += \ $(call gb_Helper_define_if_set,\ DISABLE_DYNLOADING \ DISABLE_EXPORT \ - DISABLE_SCRIPTING \ ENABLE_LTO \ ) |