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

Repository.mk

@@ -173,7 +173,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,calc, \
 	wpftcalc \
 	$(if $(ENABLE_OPENCL),scopencl) \
 	$(if $(ENABLE_COINMP)$(ENABLE_LPSOLVE),solver) \
-	$(if $(DISABLE_SCRIPTING),,vbaobj) \
+	$(call gb_Helper_optional,SCRIPTING,vbaobj) \
 ))
 
 $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,graphicfilter, \
@@ -244,8 +244,10 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
 		$(if $(filter-out 1050 1060,$(MACOSX_SDK_VERSION)),avmediaMacAVF) \
 		$(if $(ENABLE_MACOSX_SANDBOX),,avmediaQuickTime) \
 	) \
-	$(if $(DISABLE_SCRIPTING),,basctl) \
-	$(if $(DISABLE_SCRIPTING),,basprov) \
+	$(call gb_Helper_optional,SCRIPTING, \
+		basctl \
+		basprov \
+	) \
 	$(if $(filter $(OS),ANDROID),, \
 		basebmp \
 	) \
@@ -271,7 +273,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
 	deploymentmisc \
 	$(if $(filter-out MACOSX WNT,$(OS)),desktopbe1) \
 	$(if $(filter unx,$(GUIBASE)),desktop_detector) \
-	$(if $(DISABLE_SCRIPTING),,dlgprov) \
+	$(call gb_Helper_optional,SCRIPTING,dlgprov) \
 	$(if $(ENABLE_DIRECTX),directx9canvas) \
 	$(if $(ENABLE_OPENGL_CANVAS),oglcanvas) \
 	drawinglayer \
@@ -335,7 +337,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
 	migrationoo2 \
 	migrationoo3 \
 	msfilter \
-	$(if $(DISABLE_SCRIPTING),,msforms) \
+	$(call gb_Helper_optional,SCRIPTING,msforms) \
 	mtfrenderer \
 	$(call gb_Helper_optional,DBCONNECTIVITY,mysql) \
 	odbc \
@@ -346,7 +348,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
 	pcr \
 	$(if $(ENABLE_NPAPI_FROM_BROWSER),pl) \
 	pdffilter \
-	$(if $(DISABLE_SCRIPTING),,protocolhandler) \
+	$(call gb_Helper_optional,SCRIPTING,protocolhandler) \
 	res \
 	sax \
 	sb \
@@ -363,7 +365,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
 	spell \
 	$(if $(ENABLE_HEADLESS),,spl) \
 	storagefd \
-	$(if $(DISABLE_SCRIPTING),,stringresource) \
+	$(call gb_Helper_optional,SCRIPTING,stringresource) \
 	svgio \
 	svl \
 	svt \
@@ -387,8 +389,10 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
 	updatefeed \
 	utl \
 	uui \
-	$(if $(DISABLE_SCRIPTING),,vbaevents) \
-	$(if $(DISABLE_SCRIPTING),,vbahelper) \
+	$(call gb_Helper_optional,SCRIPTING, \
+		vbaevents \
+		vbahelper \
+	) \
 	vcl \
 	vclcanvas \
 	vclopengl \
@@ -461,7 +465,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,writer, \
 	swd \
 	swui \
 	t602filter \
-	$(if $(DISABLE_SCRIPTING),,vbaswobj) \
+	$(call gb_Helper_optional,SCRIPTING,vbaswobj) \
 	wpftwriter \
 	writerfilter \
 ))
@@ -560,7 +564,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \
 	$(if $(filter WNT-TRUE,$(OS)-$(DISABLE_ATL)),,emboleobj) \
 	package2 \
 	$(if $(and $(filter unx,$(GUIBASE)),$(filter-out MACOSX,$(OS))),recentfile) \
-	$(if $(DISABLE_SCRIPTING),,scriptframe) \
+	$(call gb_Helper_optional,SCRIPTING,scriptframe) \
 	sdbc2 \
 	sofficeapp \
 	srtrs1 \

basctl/Module_basctl.mk

@@ -19,7 +19,7 @@
 
 $(eval $(call gb_Module_Module,basctl))
 
-ifneq ($(DISABLE_SCRIPTING),TRUE)
+ifneq ($(filter SCRIPTING,$(BUILD_TYPE)),)
 
 $(eval $(call gb_Module_add_targets,basctl,\
 	Library_basctl \

basic/Library_sb.mk

@@ -59,7 +59,7 @@ $(eval $(call gb_Library_use_libraries,sb,\
 	$(gb_UWINAPI) \
 ))
 
-ifneq ($(DISABLE_SCRIPTING),TRUE)
+ifneq ($(filter SCRIPTING,$(BUILD_TYPE)),)
 
 $(eval $(call gb_Library_add_exception_objects,sb,\
 	basic/source/basmgr/basicmanagerrepository \

basic/Module_basic.mk

@@ -9,7 +9,7 @@
 
 $(eval $(call gb_Module_Module,basic))
 
-ifneq ($(DISABLE_SCRIPTING),TRUE)
+ifneq ($(filter SCRIPTING,$(BUILD_TYPE)),)
 
 $(eval $(call gb_Module_add_l10n_targets,basic,\
 	AllLangResTarget_sb \

basic/source/runtime/methods.cxx

@@ -17,6 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <config_features.h>
+
 #include <tools/date.hxx>
 #include <basic/sbxvar.hxx>
 #include <basic/sbuno.hxx>
@@ -94,7 +96,7 @@ using namespace com::sun::star::uno;
 #include <postwin.h>
 #endif
 
-#ifndef DISABLE_SCRIPTING
+#if HAVE_FEATURE_SCRIPTING
 
 static void FilterWhiteSpace( OUString& rStr )
 {
@@ -4876,7 +4878,7 @@ sal_Int16 implGetDateYear( double aDate )
 
 bool implDateSerial( sal_Int16 nYear, sal_Int16 nMonth, sal_Int16 nDay, double& rdRet )
 {
-#ifndef DISABLE_SCRIPTING
+#if HAVE_FEATURE_SCRIPTING
     if ( nYear < 30 && SbiRuntime::isVBAEnabled() )
     {
         nYear += 2000;
@@ -4892,26 +4894,26 @@ bool implDateSerial( sal_Int16 nYear, sal_Int16 nMonth, sal_Int16 nDay, double&
     Date aCurDate( nDay, nMonth, nYear );
     if ((nYear < 100 || nYear > 9999) )
     {
-#ifndef DISABLE_SCRIPTING
+#if HAVE_FEATURE_SCRIPTING
         StarBASIC::Error( SbERR_BAD_ARGUMENT );
 #endif
         return false;
     }
 
-#ifndef DISABLE_SCRIPTING
+#if HAVE_FEATURE_SCRIPTING
     if ( !SbiRuntime::isVBAEnabled() )
 #endif
     {
         if ( (nMonth < 1 || nMonth > 12 )||
              (nDay < 1 || nDay > 31 ) )
         {
-#ifndef DISABLE_SCRIPTING
+#if HAVE_FEATURE_SCRIPTING
             StarBASIC::Error( SbERR_BAD_ARGUMENT );
 #endif
             return false;
         }
     }
-#ifndef DISABLE_SCRIPTING
+#if HAVE_FEATURE_SCRIPTING
     else
     {
         // grab the year & month

basic/source/runtime/methods1.cxx

@@ -17,6 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <config_features.h>
+
 #include <sal/config.h>
 
 #include <cstddef>
@@ -96,7 +98,7 @@ static Reference< XCalendar3 > getLocaleCalendar( void )
     return xCalendar;
 }
 
-#ifndef DISABLE_SCRIPTING
+#if HAVE_FEATURE_SCRIPTING
 
 RTLFUNC(CallByName)
 {
@@ -3316,7 +3318,7 @@ sal_Int16 implGetWeekDay( double aDate, bool bFirstDayParam, sal_Int16 nFirstDay
     {
         if( nFirstDay < 0 || nFirstDay > 7 )
         {
-#ifndef DISABLE_SCRIPTING
+#if HAVE_FEATURE_SCRIPTING
             StarBASIC::Error( SbERR_BAD_ARGUMENT );
 #endif
             return 0;
@@ -3326,7 +3328,7 @@ sal_Int16 implGetWeekDay( double aDate, bool bFirstDayParam, sal_Int16 nFirstDay
             Reference< XCalendar3 > xCalendar = getLocaleCalendar();
             if( !xCalendar.is() )
             {
-#ifndef DISABLE_SCRIPTING
+#if HAVE_FEATURE_SCRIPTING
                 StarBASIC::Error( SbERR_INTERNAL_ERROR );
 #endif
                 return 0;

basic/source/sbx/sbxarray.cxx

@@ -17,6 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <config_features.h>
+
 #include <tools/debug.hxx>
 #include <tools/stream.hxx>
 #include <basic/sbx.hxx>
@@ -731,7 +733,7 @@ void SbxDimArray::Put32( SbxVariable* p, const sal_Int32* pIdx  )
 // Element-Number with the help of Parameter-Array
 sal_uInt32 SbxDimArray::Offset32( SbxArray* pPar )
 {
-#ifndef DISABLE_SCRIPTING
+#if HAVE_FEATURE_SCRIPTING
     if (m_vDimensions.empty() || !pPar ||
         ((m_vDimensions.size() != sal::static_int_cast<size_t>(pPar->Count() - 1))
             && SbiRuntime::isVBAEnabled()))

basic/source/sbx/sbxdbl.cxx

@@ -17,6 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <config_features.h>
+
 #include <tools/errcode.hxx>
 #include <basic/sbx.hxx>
 #include "sbxconv.hxx"
@@ -69,7 +71,7 @@ double ImpGetDouble( const SbxValues* p )
             if( !p->pOUString )
             {
                 nRes = 0;
-#ifndef DISABLE_SCRIPTING
+#if HAVE_FEATURE_SCRIPTING
                 if ( SbiRuntime::isVBAEnabled() )// VBA only behaviour
                     SbxBase::SetError( SbxERR_CONVERSION );
 #endif
@@ -81,7 +83,7 @@ double ImpGetDouble( const SbxValues* p )
                 if( ImpScan( *p->pOUString, d, t, NULL ) != SbxERR_OK )
                 {
                     nRes = 0;
-#ifndef DISABLE_SCRIPTING
+#if HAVE_FEATURE_SCRIPTING
                     if ( SbiRuntime::isVBAEnabled() )// VBA only behaviour
                         SbxBase::SetError( SbxERR_CONVERSION );
 #endif

basic/source/sbx/sbxscan.cxx

@@ -17,6 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <config_features.h>
+
 #include <tools/errcode.hxx>
 #include <basic/sbx.hxx>
 #include "sbxconv.hxx"
@@ -250,7 +252,7 @@ SbxError ImpScan( const OUString& rWSrc, double& nVal, SbxDataType& rType,
         if( l >= SbxMININT && l <= SbxMAXINT )
             eScanType = SbxINTEGER;
     }
-#ifndef DISABLE_SCRIPTING
+#if HAVE_FEATURE_SCRIPTING
     else if ( SbiRuntime::isVBAEnabled() )
     {
         OSL_TRACE("Reporting error converting");

basic/source/sbx/sbxstr.cxx

@@ -17,6 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <config_features.h>
+
 #include <tools/errcode.hxx>
 #include <basic/sbx.hxx>
 #include "sbxconv.hxx"
@@ -260,7 +262,7 @@ SbxArray* StringToByteArray(const OUString& rStr)
     sal_Int32 nArraySize = rStr.getLength() * 2;
     const sal_Unicode* pSrc = rStr.getStr();
     SbxDimArray* pArray = new SbxDimArray(SbxBYTE);
-#ifdef DISABLE_SCRIPTING
+#if !HAVE_FEATURE_SCRIPTING
     bool bIncIndex = false;
 #else
     bool bIncIndex = ( IsBaseIndexOne() && SbiRuntime::isVBAEnabled() );

basic/source/sbx/sbxvalue.cxx

@@ -17,6 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <config_features.h>
 
 #include <math.h>
 #include <tools/debug.hxx>
@@ -259,7 +260,7 @@ SbxValue* SbxValue::TheRealValue( bool bObjInObjError ) const
                     ((SbxValue*) pObj)->aData.eType == SbxOBJECT &&
                     ((SbxValue*) pObj)->aData.pObj == pObj )
                 {
-#ifdef DISABLE_SCRIPTING // No sbunoobj
+#if !HAVE_FEATURE_SCRIPTING
                     const bool bSuccess = false;
 #else
                     bool bSuccess = handleToStringForCOMObjects( pObj, p );
@@ -871,8 +872,8 @@ bool SbxValue::Convert( SbxDataType eTo )
 
 bool SbxValue::Compute( SbxOperator eOp, const SbxValue& rOp )
 {
-#ifdef DISABLE_SCRIPTING
-    bool bVBAInterop = false;
+#if !HAVE_FEATURE_SCRIPTING
+    const bool bVBAInterop = false;
 #else
     bool bVBAInterop =  SbiRuntime::isVBAEnabled();
 #endif
@@ -1243,8 +1244,8 @@ Lbl_OpIsEmpty:
 
 bool SbxValue::Compare( SbxOperator eOp, const SbxValue& rOp ) const
 {
-#ifdef DISABLE_SCRIPTING
-    bool bVBAInterop = false;
+#if !HAVE_FEATURE_SCRIPTING
+    const bool bVBAInterop = false;
 #else
     bool bVBAInterop =  SbiRuntime::isVBAEnabled();
 #endif

basic/source/sbx/sbxvar.cxx

@@ -17,6 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <config_features.h>
+
 #include <tools/debug.hxx>
 #include <tools/stream.hxx>
 #include <svl/SfxBroadcaster.hxx>
@@ -78,7 +80,7 @@ SbxVariable::SbxVariable( const SbxVariable& r )
     if( r.mpSbxVariableImpl != NULL )
     {
         mpSbxVariableImpl = new SbxVariableImpl( *r.mpSbxVariableImpl );
-#ifndef DISABLE_SCRIPTING
+#if HAVE_FEATURE_SCRIPTING
         if( mpSbxVariableImpl->m_xComListener.is() )
         {
             registerComListenerVariableForBasic( this, mpSbxVariableImpl->m_pComListenerParentBasic );
@@ -112,7 +114,7 @@ SbxVariable::SbxVariable( SbxDataType t, void* p ) : SbxValue( t, p )
 
 SbxVariable::~SbxVariable()
 {
-#ifndef DISABLE_SCRIPTING
+#if HAVE_FEATURE_SCRIPTING
     if( IsSet( SBX_DIM_AS_NEW ))
     {
         removeDimAsNewRecoverItem( this );
@@ -347,7 +349,7 @@ SbxVariable& SbxVariable::operator=( const SbxVariable& r )
     if( r.mpSbxVariableImpl != NULL )
     {
         mpSbxVariableImpl = new SbxVariableImpl( *r.mpSbxVariableImpl );
-#ifndef DISABLE_SCRIPTING
+#if HAVE_FEATURE_SCRIPTING
         if( mpSbxVariableImpl->m_xComListener.is() )
         {
             registerComListenerVariableForBasic( this, mpSbxVariableImpl->m_pComListenerParentBasic );
@@ -450,7 +452,7 @@ void SbxVariable::SetComListener( ::com::sun::star::uno::Reference< ::com::sun::
     SbxVariableImpl* pImpl = getImpl();
     pImpl->m_xComListener = xComListener;
     pImpl->m_pComListenerParentBasic = pParentBasic;
-#ifndef DISABLE_SCRIPTING
+#if HAVE_FEATURE_SCRIPTING
     registerComListenerVariableForBasic( this, pParentBasic );
 #endif
 }

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 \

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 \

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 \

config_host.mk.in

@@ -97,7 +97,6 @@ export DISABLE_DYNLOADING=@DISABLE_DYNLOADING@
 export DISABLE_EXPORT=@DISABLE_EXPORT@
 export DISABLE_OPENSSL=@DISABLE_OPENSSL@
 export DISABLE_PYTHON=@DISABLE_PYTHON@
-export DISABLE_SCRIPTING=@DISABLE_SCRIPTING@
 export DLLTOOL=@DLLTOOL@
 export DOCDIR=@DOCDIR@
 export DOXYGEN=@DOXYGEN@

config_host/config_features.h.in

@@ -64,6 +64,16 @@
 
 #define HAVE_FEATURE_EXTENSIONS 0
 
+/* SCRIPTING - Whether we have any mechanism to execute user-provided scripts
+ *
+ * Primarily intended for the iOS App Store where the
+ * rules prohibit user-accessible scripting features.
+ * Sure, it would be nice to still be able to have internal features
+ * implemented in some scripting language. Later, if necessary.
+ */
+
+#define HAVE_FEATURE_SCRIPTING 0
+
 /* MULTIUSER_ENVIRONMENT - Wheter running on a "normal" multi-user
  * desktop (or server) OS
  *

configure.ac

@@ -2512,11 +2512,11 @@ fi
 DISABLE_SCRIPTING=''
 if test "$enable_scripting" = yes; then
     BUILD_TYPE="$BUILD_TYPE SCRIPTING"
+    AC_DEFINE(HAVE_FEATURE_SCRIPTING)
 else
     DISABLE_SCRIPTING='TRUE'
     SCPDEFS="$SCPDEFS -DDISABLE_SCRIPTING"
 fi
-AC_SUBST(DISABLE_SCRIPTING)
 
 if test $_os = iOS -o $_os = Android; then
     # Disable dynamic_loading always for iOS and Android

cui/Library_cui.mk

@@ -137,7 +137,7 @@ $(eval $(call gb_Library_add_exception_objects,cui,\
 	cui/source/options/optaboutconfig \
     cui/source/options/optaccessibility \
     cui/source/options/optasian \
-    $(if $(DISABLE_SCRIPTING),, \
+    $(call gb_Helper_optional,SCRIPTING, \
         cui/source/options/optbasic) \
     cui/source/options/optchart \
     cui/source/options/optcolor \

cui/source/options/treeopt.cxx

@@ -17,6 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <config_features.h>
+
 #include "cuires.hrc"
 #include "helpid.hrc"
 
@@ -320,7 +322,7 @@ SfxTabPage* CreateGeneralTabPage( sal_uInt16 nId, vcl::Window* pParent, const Sf
         case RID_SVXPAGE_OPTIONS_JAVA:              fnCreate = &SvxJavaOptionsPage::Create ; break;
         case RID_SVXPAGE_ONLINEUPDATE:              fnCreate = &SvxOnlineUpdateTabPage::Create; break;
         case RID_OPTPAGE_CHART_DEFCOLORS:           fnCreate = &SvxDefaultColorOptPage::Create; break;
-#ifndef DISABLE_SCRIPTING
+#if HAVE_FEATURE_SCRIPTING
         case RID_SVXPAGE_BASICIDE_OPTIONS:          fnCreate = &SvxBasicIDEOptionsPage::Create; break;
 #endif
     }

dbaccess/source/core/dataaccess/databasecontext.cxx

@@ -17,6 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <config_features.h>
+
 #include "apitools.hxx"
 #include "core_resource.hrc"
 #include "core_resource.hxx"
@@ -172,7 +174,7 @@ ODatabaseContext::ODatabaseContext( const Reference< XComponentContext >& _rxCon
 {
     m_pDatabaseDocumentLoader = new DatabaseDocumentLoader( _rxContext );
 
-#ifndef DISABLE_SCRIPTING
+#if HAVE_FEATURE_SCRIPTING
     ::basic::BasicManagerRepository::registerCreationListener( *this );
 #endif
 
@@ -188,7 +190,7 @@ ODatabaseContext::ODatabaseContext( const Reference< XComponentContext >& _rxCon
 
 ODatabaseContext::~ODatabaseContext()
 {
-#ifndef DISABLE_SCRIPTING
+#if HAVE_FEATURE_SCRIPTING
     ::basic::BasicManagerRepository::revokeCreationListener( *this );
 #endif
 
@@ -739,7 +741,7 @@ Sequence< sal_Int8 > ODatabaseContext::getUnoTunnelImplementationId()
 
 void ODatabaseContext::onBasicManagerCreated( const Reference< XModel >& _rxForDocument, BasicManager& _rBasicManager )
 {
-#ifdef DISABLE_SCRIPTING
+#if !HAVE_FEATURE_SCRIPTING
     (void) _rxForDocument;
     (void) _rBasicManager;
 #else

desktop/source/app/app.cxx

@@ -1723,7 +1723,7 @@ int Desktop::doShutdown()
     // with the solar mutex unlocked, to avoid deadlock:
     sal_uLong nAcquireCount = Application::ReleaseSolarMutex();
     DeregisterServices();
-#ifndef DISABLE_SCRIPTING
+#if HAVE_FEATURE_SCRIPTING
     StarBASIC::DetachAllDocBasicItems();
 #endif
     Application::AcquireSolarMutex(nAcquireCount);

filter/source/msfilter/msvbahelper.cxx

@@ -17,6 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <config_features.h>
+
 #include <filter/msfilter/msvbahelper.hxx>
 #include <basic/sbx.hxx>
 #include <basic/sbstar.hxx>
@@ -172,7 +174,7 @@ bool hasMacro( SfxObjectShell* pShell, const OUString& sLibrary, OUString& sMod,
 {
     bool bFound = false;
 
-#ifdef DISABLE_SCRIPTING
+#if !HAVE_FEATURE_SCRIPTING
     (void) pShell;
     (void) sLibrary;
     (void) sMod;
@@ -264,7 +266,7 @@ void parseMacro( const OUString& sMacro, OUString& sContainer, OUString& sModule
 
 OUString resolveVBAMacro( SfxObjectShell* pShell, const OUString& rLibName, const OUString& rModuleName, const OUString& rMacroName )
 {
-#ifdef DISABLE_SCRIPTING
+#if !HAVE_FEATURE_SCRIPTING
     (void) pShell;
     (void) rLibName;
     (void) rModuleName;
@@ -283,7 +285,7 @@ OUString resolveVBAMacro( SfxObjectShell* pShell, const OUString& rLibName, cons
 
 MacroResolvedInfo resolveVBAMacro( SfxObjectShell* pShell, const OUString& MacroName, bool bSearchGlobalTemplates )
 {
-#ifdef DISABLE_SCRIPTING
+#if !HAVE_FEATURE_SCRIPTING
     (void) pShell;
     (void) MacroName;
     (void) bSearchGlobalTemplates;
@@ -458,7 +460,7 @@ MacroResolvedInfo resolveVBAMacro( SfxObjectShell* pShell, const OUString& Macro
 // Treat the args as possible inouts ( conversion at bottom of method )
 bool executeMacro( SfxObjectShell* pShell, const OUString& sMacroName, uno::Sequence< uno::Any >& aArgs, uno::Any& aRet, const uno::Any& /*aCaller*/)
 {
-#ifdef DISABLE_SCRIPTING
+#if !HAVE_FEATURE_SCRIPTING
     (void) pShell;
     (void) sMacroName;
     (void) aArgs;

filter/source/msfilter/svxmsbas2.cxx

@@ -17,6 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <config_features.h>
 
 #include <basic/basmgr.hxx>
 #include <sfx2/objsh.hxx>
@@ -38,7 +39,7 @@ sal_uLong SvxImportMSVBasic::SaveOrDelMSVBAStorage( bool bSaveInto,
         xVBAStg = 0;
         if( bSaveInto )
         {
-#ifndef DISABLE_SCRIPTING
+#if HAVE_FEATURE_SCRIPTING
             BasicManager *pBasicMan = rDocSh.GetBasicManager();
             if( pBasicMan && pBasicMan->IsBasicModified() )
                 nRet = ERRCODE_SVX_MODIFIED_VBASIC_STORAGE;

librelogo/Module_librelogo.mk

@@ -9,7 +9,7 @@
 
 $(eval $(call gb_Module_Module,librelogo))
 
-ifneq ($(DISABLE_SCRIPTING),TRUE)
+ifneq ($(filter SCRIPTING,$(BUILD_TYPE)),)
 ifneq ($(DISABLE_PYTHON),TRUE)
 
 $(eval $(call gb_Module_add_targets,librelogo,\

postprocess/Rdb_services.mk

@@ -161,7 +161,7 @@ $(eval $(call gb_Rdb_add_components,services,\
 	$(if $(WITH_WEBDAV), \
 		ucb/source/ucp/webdav-neon/ucpdav1 \
 	) \
-	$(if $(DISABLE_SCRIPTING),, \
+	$(call gb_Helper_optional,SCRIPTING, \
 		basctl/util/basctl \
 		basic/util/sb \
 		sc/util/vbaobj \

sc/CppunitTest_sc_annotationobj.mk

@@ -87,7 +87,7 @@ $(eval $(call gb_CppunitTest_use_components,sc_annotationobj,\
     sc/util/sc \
     sc/util/scd \
     sc/util/scfilt \
-    $(if $(filter TRUE,$(DISABLE_SCRIPTING)),, \
+    $(call gb_Helper_optional,SCRIPTING, \
 	    sc/util/vbaobj) \
     sfx2/util/sfx \
     sot/util/sot \

sc/CppunitTest_sc_annotationshapeobj.mk

@@ -84,7 +84,7 @@ $(eval $(call gb_CppunitTest_use_components,sc_annotationshapeobj,\
     sc/util/sc \
     sc/util/scd \
     sc/util/scfilt \
-    $(if $(filter TRUE,$(DISABLE_SCRIPTING)),, \
+    $(call gb_Helper_optional,SCRIPTING, \
 		sc/util/vbaobj) \
     sfx2/util/sfx \
     sot/util/sot \

sc/CppunitTest_sc_annotationsobj.mk

@@ -87,7 +87,7 @@ $(eval $(call gb_CppunitTest_use_components,sc_annotationsobj,\
     sc/util/sc \
     sc/util/scd \
     sc/util/scfilt \
-    $(if $(filter TRUE,$(DISABLE_SCRIPTING)),, \
+    $(call gb_Helper_optional,SCRIPTING, \
 	    sc/util/vbaobj) \
     sfx2/util/sfx \
     sot/util/sot \

sc/CppunitTest_sc_cellrangeobj.mk

@@ -87,7 +87,7 @@ $(eval $(call gb_CppunitTest_use_components,sc_cellrangeobj,\
     sc/util/sc \
     sc/util/scd \
     sc/util/scfilt \
-    $(if $(filter TRUE,$(DISABLE_SCRIPTING)),, \
+    $(call gb_Helper_optional,SCRIPTING, \
 	    sc/util/vbaobj) \
     sfx2/util/sfx \
     sot/util/sot \

sc/CppunitTest_sc_chart_regression_test.mk

@@ -88,7 +88,7 @@ $(eval $(call gb_CppunitTest_use_components,sc_chart_regression_test,\
     sc/util/sc \
     sc/util/scd \
     sc/util/scfilt \
-    $(if $(filter TRUE,$(DISABLE_SCRIPTING)),, \
+    $(call gb_Helper_optional,SCRIPTING, \
 	    sc/util/vbaobj) \
     sfx2/util/sfx \
     sot/util/sot \

sc/CppunitTest_sc_datapilotfieldobj.mk

@@ -86,7 +86,7 @@ $(eval $(call gb_CppunitTest_use_components,sc_datapilotfieldobj,\
     sc/util/sc \
     sc/util/scd \
     sc/util/scfilt \
-    $(if $(filter TRUE,$(DISABLE_SCRIPTING)),, \
+    $(call gb_Helper_optional,SCRIPTING, \
 	    sc/util/vbaobj) \
     sfx2/util/sfx \
     sot/util/sot \

sc/CppunitTest_sc_datapilottableobj.mk

@@ -86,7 +86,7 @@ $(eval $(call gb_CppunitTest_use_components,sc_datapilottableobj,\
     sc/util/sc \
     sc/util/scd \
     sc/util/scfilt \
-    $(if $(filter TRUE,$(DISABLE_SCRIPTING)),, \
+    $(call gb_Helper_optional,SCRIPTING, \
 	    sc/util/vbaobj) \
     sfx2/util/sfx \
     sot/util/sot \

sc/CppunitTest_sc_editfieldobj_cell.mk

@@ -85,7 +85,7 @@ $(eval $(call gb_CppunitTest_use_components,sc_editfieldobj_cell,\
     sc/util/sc \
     sc/util/scd \
     sc/util/scfilt \
-    $(if $(filter TRUE,$(DISABLE_SCRIPTING)),, \
+    $(call gb_Helper_optional,SCRIPTING, \
 	    sc/util/vbaobj) \
     sfx2/util/sfx \
     sot/util/sot \

sc/CppunitTest_sc_editfieldobj_header.mk

@@ -85,7 +85,7 @@ $(eval $(call gb_CppunitTest_use_components,sc_editfieldobj_header,\
     sc/util/sc \
     sc/util/scd \
     sc/util/scfilt \
-    $(if $(filter TRUE,$(DISABLE_SCRIPTING)),, \
+    $(call gb_Helper_optional,SCRIPTING, \
 	    sc/util/vbaobj) \
     sfx2/util/sfx \
     sot/util/sot \

sc/CppunitTest_sc_html_export_test.mk

@@ -90,7 +90,7 @@ $(eval $(call gb_CppunitTest_use_components,sc_html_export_test,\
     sc/util/sc \
     sc/util/scd \
     sc/util/scfilt \
-    $(if $(filter TRUE,$(DISABLE_SCRIPTING)),, \
+    $(call gb_Helper_optional,SCRIPTING, \
 	    sc/util/vbaobj) \
     sfx2/util/sfx \
     sot/util/sot \

sc/CppunitTest_sc_macros_test.mk

@@ -93,7 +93,7 @@ $(eval $(call gb_CppunitTest_use_components,sc_macros_test,\
     sc/util/sc \
     sc/util/scd \
     sc/util/scfilt \
-    $(if $(filter TRUE,$(DISABLE_SCRIPTING)),, \
+    $(call gb_Helper_optional,SCRIPTING, \
 	    sc/util/vbaobj) \
     sfx2/util/sfx \
     sot/util/sot \

sc/CppunitTest_sc_modelobj.mk

@@ -86,7 +86,7 @@ $(eval $(call gb_CppunitTest_use_components,sc_modelobj,\
     sc/util/sc \
     sc/util/scd \
     sc/util/scfilt \
-    $(if $(filter TRUE,$(DISABLE_SCRIPTING)),, \
+    $(call gb_Helper_optional,SCRIPTING, \
 	    sc/util/vbaobj) \
     sfx2/util/sfx \
     sot/util/sot \

sc/CppunitTest_sc_namedrangeobj.mk

@@ -86,7 +86,7 @@ $(eval $(call gb_CppunitTest_use_components,sc_namedrangeobj,\
     sc/util/sc \
     sc/util/scd \
     sc/util/scfilt \
-    $(if $(filter TRUE,$(DISABLE_SCRIPTING)),, \
+