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 /chart2 | |
| 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 'chart2')
| -rw-r--r-- | chart2/CppunitTest_chart2_export.mk | 2 | ||||
| -rw-r--r-- | chart2/CppunitTest_chart2_import.mk | 2 | ||||
| -rw-r--r-- | chart2/CppunitTest_chart2_xshape.mk | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/chart2/CppunitTest_chart2_export.mk b/chart2/CppunitTest_chart2_export.mk index 3b941a9b2034..a1a4bd6bac8c 100644 --- a/chart2/CppunitTest_chart2_export.mk +++ b/chart2/CppunitTest_chart2_export.mk @@ -105,7 +105,7 @@ $(eval $(call gb_CppunitTest_use_components,chart2_export,\ sd/util/sd \ sd/util/sdfilt \ sd/util/sdd \ - $(if $(filter TRUE,$(DISABLE_SCRIPTING)),, \ + $(call gb_Helper_optional,SCRIPTING, \ sc/util/vbaobj) \ scaddins/source/analysis/analysis \ scaddins/source/datefunc/date \ diff --git a/chart2/CppunitTest_chart2_import.mk b/chart2/CppunitTest_chart2_import.mk index f925e58acd70..742f7f68aea6 100644 --- a/chart2/CppunitTest_chart2_import.mk +++ b/chart2/CppunitTest_chart2_import.mk @@ -103,7 +103,7 @@ $(eval $(call gb_CppunitTest_use_components,chart2_import,\ sd/util/sd \ sd/util/sdfilt \ sd/util/sdd \ - $(if $(filter TRUE,$(DISABLE_SCRIPTING)),, \ + $(call gb_Helper_optional,SCRIPTING, \ sc/util/vbaobj) \ scaddins/source/analysis/analysis \ scaddins/source/datefunc/date \ diff --git a/chart2/CppunitTest_chart2_xshape.mk b/chart2/CppunitTest_chart2_xshape.mk index 9d5076b52e42..99149a6e0cb2 100644 --- a/chart2/CppunitTest_chart2_xshape.mk +++ b/chart2/CppunitTest_chart2_xshape.mk @@ -101,7 +101,7 @@ $(eval $(call gb_CppunitTest_use_components,chart2_xshape,\ sd/util/sd \ sd/util/sdfilt \ sd/util/sdd \ - $(if $(filter TRUE,$(DISABLE_SCRIPTING)),, \ + $(call gb_Helper_optional,SCRIPTING, \ sc/util/vbaobj) \ scaddins/source/analysis/analysis \ scaddins/source/datefunc/date \ |