[Libreoffice-commits] core.git: RepositoryExternal.mk

[Rene Engelhard]

 RepositoryExternal.mk |    7 +++++++
 1 file changed, 7 insertions(+)

New commits:
commit 40facc4ea878fb674214af697cc738cdf6573150
Author: Rene Engelhard <rene at debian.org>
Date:   Fri May 23 07:43:19 2014 +0200

    don't unconditionally require bsh.jar and js.jar in RepositoryExternal.mk
    
    ... as they can be disabled and thus are not there at install
    
    Change-Id: I197b5053971d2721114b2ebc7b3c31db36c3f58e

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 2db4c38..8b35b8c 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -3181,6 +3181,8 @@ endef
 endif # SYSTEM_HSQLDB
 
 
+ifeq ($(ENABLE_SCRIPTING_BEANSHELL),TRUE)
+
 ifneq ($(SYSTEM_BSH),)
 
 define gb_Jar__use_bsh
@@ -3201,6 +3203,9 @@ endef
 
 endif # SYSTEM_BSH
 
+endif
+
+ifeq ($(ENABLE_SCRIPTING_JAVASCRIPT),TRUE)
 
 ifneq ($(SYSTEM_RHINO),)
 
@@ -3222,6 +3227,8 @@ endef
 
 endif # SYSTEM_RHINO
 
+endif
+
 ifneq ($(SYSTEM_APACHE_COMMONS),)
 
 define gb_Jar__use_commons-codec