From 9ecac3874d179b1d7aa6b45337001b1def06a9dd Mon Sep 17 00:00:00 2001
From: Tor Lillqvist <tml@collabora.com>
Date: Tue, 21 Oct 2014 23:21:37 +0300
Subject: 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
---
 chart2/CppunitTest_chart2_xshape.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'chart2/CppunitTest_chart2_xshape.mk')

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 \
-- 
cgit