summaryrefslogtreecommitdiff
path: root/scp2/source/extensions
diff options
context:
space:
mode:
authorBjoern Michaelsen <bjoern.michaelsen@canonical.com>2014-06-11 23:06:32 +0200
committerBjoern Michaelsen <bjoern.michaelsen@canonical.com>2014-06-11 23:07:24 +0200
commit8ff029893ec9ad3e9811eb6107768156d48a997a (patch)
tree45932c9058109a49424e0b791d6001fb5d960c04 /scp2/source/extensions
parent3cf9f47c9483601e22fdb24fd4391c4eb09d990a (diff)
do no try to install bsh/js when not building them
Change-Id: Ic1521ad9a67c9930e2e4561eacb1e78905310613
Diffstat (limited to 'scp2/source/extensions')
-rw-r--r--scp2/source/extensions/module_extensions.scp6
1 files changed, 4 insertions, 2 deletions
diff --git a/scp2/source/extensions/module_extensions.scp b/scp2/source/extensions/module_extensions.scp
index 6da685c9b751..ce72b5fd0849 100644
--- a/scp2/source/extensions/module_extensions.scp
+++ b/scp2/source/extensions/module_extensions.scp
@@ -18,8 +18,6 @@
#include "macros.inc"
-#include "AutoInstall/extensions_bsh"
-#include "AutoInstall/extensions_rhino"
Module gid_Module_Optional_Extensions
MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS);
@@ -245,6 +243,8 @@ End
#if defined ENABLE_JAVA && !defined WITHOUT_SCRIPTING_BEANSHELL
+#include "AutoInstall/extensions_bsh"
+
Module gid_Module_Optional_Extensions_Script_Provider_For_BS
PackageInfo = "packinfo_extensions.txt";
MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_SCRIPT_PROVIDER_FOR_BEANSHELL);
@@ -262,6 +262,8 @@ End
#if defined ENABLE_JAVA && !defined WITHOUT_SCRIPTING_JAVASCRIPT
+#include "AutoInstall/extensions_rhino"
+
Module gid_Module_Optional_Extensions_Script_Provider_For_JS
PackageInfo = "packinfo_extensions.txt";
MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_SCRIPT_PROVIDER_FOR_JAVASCRIPT);