use Helper_optional SCRIPTING for libs that don't exist if --disable-scripting

Change-Id: Iec65d6395b903e13f788fe8322b60aac5b974cd4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120125
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>

chart2/CppunitTest_chart2_dump.mk

@@ -52,7 +52,8 @@ $(eval $(call gb_CppunitTest_use_libraries,chart2_dump, \
     ucbhelper \
     unotest \
     utl \
-    vbahelper \
+    $(call gb_Helper_optional,SCRIPTING, \
+        vbahelper) \
     xo \
     sw \
 ))

chart2/CppunitTest_chart2_geometry.mk

@@ -52,7 +52,8 @@ $(eval $(call gb_CppunitTest_use_libraries,chart2_geometry, \
     ucbhelper \
     unotest \
     utl \
-    vbahelper \
+    $(call gb_Helper_optional,SCRIPTING, \
+        vbahelper) \
     vcl \
     xo \
 ))

chart2/CppunitTest_chart2_pivot_chart_test.mk

@@ -52,7 +52,8 @@ $(eval $(call gb_CppunitTest_use_libraries,chart2_pivot_chart_test, \
     ucbhelper \
     unotest \
     utl \
-    vbahelper \
+    $(call gb_Helper_optional,SCRIPTING, \
+        vbahelper) \
     xo \
     sw \
 ))

chart2/CppunitTest_chart2_trendcalculators.mk

@@ -52,7 +52,8 @@ $(eval $(call gb_CppunitTest_use_libraries,chart2_trendcalculators, \
     ucbhelper \
     unotest \
     utl \
-    vbahelper \
+    $(call gb_Helper_optional,SCRIPTING, \
+        vbahelper) \
     xo \
     sw \
 ))

chart2/CppunitTest_chart2_xshape.mk

@@ -52,7 +52,8 @@ $(eval $(call gb_CppunitTest_use_libraries,chart2_xshape, \
     ucbhelper \
     unotest \
     utl \
-    vbahelper \
+    $(call gb_Helper_optional,SCRIPTING, \
+        vbahelper) \
     xo \
     sw \
 ))

chart2/export_setup.mk

@@ -55,7 +55,8 @@ $(eval $(call gb_CppunitTest_use_libraries,chart2_export$(1), \
     ucbhelper \
     unotest \
     utl \
-    vbahelper \
+    $(call gb_Helper_optional,SCRIPTING, \
+        vbahelper) \
     vcl \
     xo \
 ))

chart2/import_setup.mk

@@ -55,7 +55,8 @@ $(eval $(call gb_CppunitTest_use_libraries,chart2_import$(1), \
     ucbhelper \
     unotest \
     utl \
-    vbahelper \
+    $(call gb_Helper_optional,SCRIPTING, \
+        vbahelper) \
     vcl \
     xo \
 ))

sc/CppunitTest_sc_anchor_test.mk

@@ -50,7 +50,8 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_anchor_test, \
 	ucbhelper \
 	unotest \
 	utl \
-	vbahelper \
+    $(call gb_Helper_optional,SCRIPTING, \
+        vbahelper) \
 	vcl \
 	xo \
 ))

sc/CppunitTest_sc_bugfix_test.mk

@@ -52,7 +52,8 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_bugfix_test, \
     ucbhelper \
 	unotest \
     utl \
-    vbahelper \
+    $(call gb_Helper_optional,SCRIPTING, \
+        vbahelper) \
     vcl \
     xo \
 ))

sc/CppunitTest_sc_cache_test.mk

@@ -54,7 +54,8 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_cache_test, \
     ucbhelper \
 	unotest \
     utl \
-    vbahelper \
+    $(call gb_Helper_optional,SCRIPTING, \
+        vbahelper) \
     vcl \
     xo \
 ))

sc/CppunitTest_sc_chart2dataprovider.mk

@@ -52,7 +52,8 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_chart2dataprovider, \
     ucbhelper \
 	unotest \
     utl \
-    vbahelper \
+    $(call gb_Helper_optional,SCRIPTING, \
+        vbahelper) \
     vcl \
     xo \
 	$(gb_UWINAPI) \

sc/CppunitTest_sc_chart_regression_test.mk

@@ -45,7 +45,8 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_chart_regression_test, \
     ucbhelper \
 	unotest \
     utl \
-    vbahelper \
+    $(call gb_Helper_optional,SCRIPTING, \
+        vbahelper) \
     vcl \
     xo \
 ))

sc/CppunitTest_sc_cond_format_merge.mk

@@ -50,7 +50,8 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_cond_format_merge, \
     ucbhelper \
     unotest \
     utl \
-    vbahelper \
+    $(call gb_Helper_optional,SCRIPTING, \
+        vbahelper) \
     vcl \
     xo \
 ))

sc/CppunitTest_sc_copypaste.mk

@@ -52,7 +52,8 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_copypaste, \
     ucbhelper \
 	unotest \
     utl \
-    vbahelper \
+    $(call gb_Helper_optional,SCRIPTING, \
+        vbahelper) \
     vcl \
     xo \
 ))

sc/CppunitTest_sc_datapilotitemobj.mk

@@ -49,7 +49,8 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_datapilotitemobj, \
     ucbhelper \
 	unotest \
     utl \
-    vbahelper \
+    $(call gb_Helper_optional,SCRIPTING, \
+        vbahelper) \
     vcl \
     xo \
 ))

sc/CppunitTest_sc_datapilottablesobj.mk

@@ -49,7 +49,8 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_datapilottablesobj, \
 	ucbhelper \
 	unotest \
 	utl \
-	vbahelper \
+    $(call gb_Helper_optional,SCRIPTING, \
+        vbahelper) \
 	vcl \
 	xo \
 ))

sc/CppunitTest_sc_dataprovider.mk

@@ -52,7 +52,8 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_dataprovider, \
     ucbhelper \
 	unotest \
     utl \
-    vbahelper \
+    $(call gb_Helper_optional,SCRIPTING, \
+        vbahelper) \
     vcl \
     xo \
 	$(gb_UWINAPI) \

sc/CppunitTest_sc_datatransformation.mk

@@ -52,7 +52,8 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_datatransformation, \
     ucbhelper \
 	unotest \
     utl \
-    vbahelper \
+    $(call gb_Helper_optional,SCRIPTING, \
+        vbahelper) \
     vcl \
     xo \
 	$(gb_UWINAPI) \

sc/CppunitTest_sc_macros_test.mk

@@ -52,7 +52,8 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_macros_test, \
     ucbhelper \
 	unotest \
     utl \
-    vbahelper \
+    $(call gb_Helper_optional,SCRIPTING, \
+        vbahelper) \
     vcl \
     xo \
 ))

sc/CppunitTest_sc_mark_test.mk

@@ -54,7 +54,8 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_mark_test, \
     ucbhelper \
 	unotest \
     utl \
-    vbahelper \
+    $(call gb_Helper_optional,SCRIPTING, \
+        vbahelper) \
     vcl \
     xo \
 ))

sc/CppunitTest_sc_namedrangeobj.mk

@@ -49,7 +49,8 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_namedrangeobj, \
     ucbhelper \
 	unotest \
     utl \
-    vbahelper \
+    $(call gb_Helper_optional,SCRIPTING, \
+        vbahelper) \
     vcl \
     xo \
 ))

sc/CppunitTest_sc_new_cond_format_api.mk

@@ -48,7 +48,8 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_new_cond_format_api, \
 	ucbhelper \
 	unotest \
 	utl \
-	vbahelper \
+    $(call gb_Helper_optional,SCRIPTING, \
+        vbahelper) \
 	vcl \
 	xo \
 ))

sc/CppunitTest_sc_parallelism.mk

@@ -62,7 +62,8 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_parallelism, \
     ucbhelper \
 	unotest \
     utl \
-    vbahelper \
+    $(call gb_Helper_optional,SCRIPTING, \
+        vbahelper) \
     vcl \
     xo \
 ))

sc/CppunitTest_sc_perfobj.mk

@@ -49,7 +49,8 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_perfobj, \
     ucbhelper \
     unotest \
     utl \
-    vbahelper \
+    $(call gb_Helper_optional,SCRIPTING, \
+        vbahelper) \
     vcl \
     xo \
 ))

sc/CppunitTest_sc_range_test.mk

@@ -54,7 +54,8 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_range_test, \
     ucbhelper \
 	unotest \
     utl \
-    vbahelper \
+    $(call gb_Helper_optional,SCRIPTING, \
+        vbahelper) \
     vcl \
     xo \
 ))

sc/CppunitTest_sc_rangelst_test.mk

@@ -54,7 +54,8 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_rangelst_test, \
     ucbhelper \
 	unotest \
     utl \
-    vbahelper \
+    $(call gb_Helper_optional,SCRIPTING, \
+        vbahelper) \
     vcl \
     xo \
 ))

sc/CppunitTest_sc_tiledrendering.mk

@@ -32,7 +32,8 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_tiledrendering, \
     scui \
     test \
     unotest \
-    vbahelper \
+    $(call gb_Helper_optional,SCRIPTING, \
+        vbahelper) \
     vcl \
     tl \
     utl \

sc/ucalc_setup.mk

@@ -69,7 +69,8 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_ucalc$(1), \
     ucbhelper \
 	unotest \
     utl \
-    vbahelper \
+    $(call gb_Helper_optional,SCRIPTING, \
+        vbahelper) \
     vcl \
     xo \
 ))

sccomp/CppunitTest_sccomp_swarmsolvertest.mk

@@ -48,7 +48,8 @@ $(eval $(call gb_CppunitTest_use_libraries,sccomp_swarmsolvertest,\
 	ucbhelper \
 	unotest \
 	utl \
-	vbahelper \
+    $(call gb_Helper_optional,SCRIPTING, \
+        vbahelper) \
 	vcl \
 	xo \
 	$(gb_UWINAPI) \

sw/CppunitTest_sw_apitests.mk

@@ -53,7 +53,8 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_apitests, \
     ucbhelper \
     unotest \
     utl \
-    vbahelper \
+    $(call gb_Helper_optional,SCRIPTING, \
+        vbahelper) \
     vcl \
     xo \
 ))

sw/CppunitTest_sw_macros_test.mk

@@ -48,7 +48,8 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_macros_test, \
     ucbhelper \
 	unotest \
     utl \
-    vbahelper \
+    $(call gb_Helper_optional,SCRIPTING, \
+        vbahelper) \
     vcl \
     xo \
 ))

sw/CppunitTest_sw_uwriter.mk

@@ -56,7 +56,8 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_uwriter, \
     ucbhelper \
     unotest \
     utl \
-    vbahelper \
+    $(call gb_Helper_optional,SCRIPTING, \
+        vbahelper) \
     vcl \
 	xmlreader \
     xo \

sw/Library_vbaswobj.mk

@@ -56,7 +56,8 @@ $(eval $(call gb_Library_use_libraries,vbaswobj,\
     tk \
     tl \
     utl \
-    vbahelper \
+    $(call gb_Helper_optional,SCRIPTING, \
+        vbahelper) \
     vcl \
 ))
 

vcl/commonfuzzer.mk

@@ -43,10 +43,12 @@ fuzzer_externals = \
     zlib \
 
 fuzzer_core_libraries = \
-    basctl \
     avmedia \
     basegfx \
-    basprov \
+    $(call gb_Helper_optional,SCRIPTING, \
+        basctl \
+        basprov \
+    ) \
     bib \
     canvastools \
     configmgr \
@@ -71,7 +73,8 @@ fuzzer_core_libraries = \
     package2 \
     sax \
     sb \
-    scriptframe \
+    $(call gb_Helper_optional,SCRIPTING, \
+        scriptframe) \
     spell \
     sfx \
     sofficeapp \
@@ -145,9 +148,11 @@ fuzzer_calc_libraries = \
     pricing \
     scfilt \
     scd \
-    vbaevents \
+    $(call gb_Helper_optional,SCRIPTING, \
-    vbahelper \
+        vbaevents \
-    vbaobj \
+        vbahelper \
+        vbaobj \
+    ) \
     sc \
     for \
     forui \