diff options
| author | Rene Engelhard <rene@debian.org> | 2014-05-23 07:43:19 +0200 |
|---|---|---|
| committer | Rene Engelhard <rene@debian.org> | 2014-05-23 08:18:08 +0200 |
| commit | 40facc4ea878fb674214af697cc738cdf6573150 (patch) | |
| tree | 87209da9c716d8ab71276719ed7ff1a114b2e39f /RepositoryExternal.mk | |
| parent | c68c5e753de14579ba8a5f8bd5360bc0e3fd7c33 (diff) | |
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
Diffstat (limited to 'RepositoryExternal.mk')
| -rw-r--r-- | RepositoryExternal.mk | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 2db4c383c872..8b35b8c567fe 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 |