diff options
| -rw-r--r-- | configure.in | 4 | ||||
| -rw-r--r-- | scp2/source/extensions/file_extensions.scp | 4 | ||||
| -rw-r--r-- | scp2/source/extensions/module_extensions.scp | 4 | ||||
| -rw-r--r-- | scp2/source/ooo/file_ooo.scp | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/configure.in b/configure.in index 3c324811ec8b..169d994f87c7 100644 --- a/configure.in +++ b/configure.in @@ -10217,7 +10217,7 @@ if test "${enable_scripting_beanshell}" != "no" -a "x$with_java" != "xno"; then else AC_MSG_RESULT([no]) ENABLE_SCRIPTING_BEANSHELL=NO - SCPDEFS="$SCPDEFS -DWITHOUT_EXTENSION_SCRIPTING_BEANSHELL" + SCPDEFS="$SCPDEFS -DWITHOUT_SCRIPTING_BEANSHELL" fi AC_SUBST(ENABLE_SCRIPTING_BEANSHELL) AC_SUBST(SYSTEM_BSH) @@ -10251,7 +10251,7 @@ if test "${enable_scripting_javascript}" != "no" -a "x$with_java" != "xno"; then else AC_MSG_RESULT([no]) ENABLE_SCRIPTING_JAVASCRIPT=NO - SCPDEFS="$SCPDEFS -DWITHOUT_EXTENSION_SCRIPTING_JAVASCRIPT" + SCPDEFS="$SCPDEFS -DWITHOUT_SCRIPTING_JAVASCRIPT" fi AC_SUBST(ENABLE_SCRIPTING_JAVASCRIPT) AC_SUBST(SYSTEM_RHINO) diff --git a/scp2/source/extensions/file_extensions.scp b/scp2/source/extensions/file_extensions.scp index 725329553327..90e99875d32e 100644 --- a/scp2/source/extensions/file_extensions.scp +++ b/scp2/source/extensions/file_extensions.scp @@ -287,7 +287,7 @@ End /* ** Script provider for BeanShell ** */ -#if defined SOLAR_JAVA && !defined WITHOUT_EXTENSION_SCRIPTING_BEANSHELL +#if defined SOLAR_JAVA && !defined WITHOUT_SCRIPTING_BEANSHELL #if !defined SYSTEM_BSH STD_JAR_FILE( gid_File_Jar_Bsh, bsh ) @@ -306,7 +306,7 @@ End /* ** Script provider for JavaScript ** */ -#if defined SOLAR_JAVA && !defined WITHOUT_EXTENSION_SCRIPTING_JAVASCRIPT +#if defined SOLAR_JAVA && !defined WITHOUT_SCRIPTING_JAVASCRIPT STD_JAR_FILE( gid_File_Jar_Js, js ) diff --git a/scp2/source/extensions/module_extensions.scp b/scp2/source/extensions/module_extensions.scp index 01d773c017e4..91853ea629e1 100644 --- a/scp2/source/extensions/module_extensions.scp +++ b/scp2/source/extensions/module_extensions.scp @@ -326,7 +326,7 @@ End /* ** Script provider for BeanShell ** */ -#if defined SOLAR_JAVA && !defined WITHOUT_EXTENSION_SCRIPTING_BEANSHELL +#if defined SOLAR_JAVA && !defined WITHOUT_SCRIPTING_BEANSHELL Module gid_Module_Optional_Extensions_Script_Provider_For_Beanshell PackageInfo = "packinfo_extensions.txt"; @@ -345,7 +345,7 @@ End /* ** Script provider for JavaScript ** */ -#if defined SOLAR_JAVA && !defined WITHOUT_EXTENSION_SCRIPTING_JAVASCRIPT +#if defined SOLAR_JAVA && !defined WITHOUT_SCRIPTING_JAVASCRIPT Module gid_Module_Optional_Extensions_Script_Provider_For_Javascript PackageInfo = "packinfo_extensions.txt"; diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp index a42f6834abd3..ea102c302fdb 100644 --- a/scp2/source/ooo/file_ooo.scp +++ b/scp2/source/ooo/file_ooo.scp @@ -723,7 +723,7 @@ File gid_File_Scripts_Java Name = "ScriptsJava.zip"; End -#ifndef WITHOUT_EXTENSION_SCRIPTING_BEANSHELL +#ifndef WITHOUT_SCRIPTING_BEANSHELL File gid_File_Scripts_Beanshell Dir = gid_Dir_Share_Scripts; ARCHIVE_TXT_FILE_BODY; @@ -731,7 +731,7 @@ File gid_File_Scripts_Beanshell End #endif -#ifndef WITHOUT_EXTENSION_SCRIPTING_JAVASCRIPT +#ifndef WITHOUT_SCRIPTING_JAVASCRIPT File gid_File_Scripts_Javascript Dir = gid_Dir_Share_Scripts; ARCHIVE_TXT_FILE_BODY; |