scp2/source/extensions/module_extensions.scp | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
New commits:
commit 8ff029893ec9ad3e9811eb6107768156d48a997a
Author: Bjoern Michaelsen <bjoern.michael...@canonical.com>
Date: Wed Jun 11 23:06:32 2014 +0200
do no try to install bsh/js when not building them
Change-Id: Ic1521ad9a67c9930e2e4561eacb1e78905310613
diff --git a/scp2/source/extensions/module_extensions.scp
b/scp2/source/extensions/module_extensions.scp
index 6da685c..ce72b5f 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);
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
