Kaydet (Commit) 40facc4e authored tarafından Rene Engelhard's avatar Rene Engelhard

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
üst c68c5e75
...@@ -3181,6 +3181,8 @@ endef ...@@ -3181,6 +3181,8 @@ endef
endif # SYSTEM_HSQLDB endif # SYSTEM_HSQLDB
ifeq ($(ENABLE_SCRIPTING_BEANSHELL),TRUE)
ifneq ($(SYSTEM_BSH),) ifneq ($(SYSTEM_BSH),)
define gb_Jar__use_bsh define gb_Jar__use_bsh
...@@ -3201,6 +3203,9 @@ endef ...@@ -3201,6 +3203,9 @@ endef
endif # SYSTEM_BSH endif # SYSTEM_BSH
endif
ifeq ($(ENABLE_SCRIPTING_JAVASCRIPT),TRUE)
ifneq ($(SYSTEM_RHINO),) ifneq ($(SYSTEM_RHINO),)
...@@ -3222,6 +3227,8 @@ endef ...@@ -3222,6 +3227,8 @@ endef
endif # SYSTEM_RHINO endif # SYSTEM_RHINO
endif
ifneq ($(SYSTEM_APACHE_COMMONS),) ifneq ($(SYSTEM_APACHE_COMMONS),)
define gb_Jar__use_commons-codec define gb_Jar__use_commons-codec
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment