From 32af02b32f1ab7f2683749e6c949470847175da0 Mon Sep 17 00:00:00 2001
From: Tomas Chvatal <tchvatal@suse.cz>
Date: Sun, 6 May 2012 12:49:33 +0200
Subject: Allow usage of system rhino wrt fdo#42977

It is done the same way the beanshell is handled.
Currently it can't be enabled by default as internal version has
patched-in debug interface.
We can choose two paths, rewrite the code to the new rhino debug
interface or just strip the current one out.

Change-Id: I48af18c635816db8269f13a649b62e9c454ee1e6
---
 RepositoryExternal.mk | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

(limited to 'RepositoryExternal.mk')

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 09ea15cc90f4..bb5b16fc7ada 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -1338,4 +1338,18 @@ endef
 endif # SYSTEM_BSH
 
 
+ifeq ($(SYSTEM_RHINO),YES)
+
+define gb_JavaClassSet__use_rhino
+$(call gb_JavaClassSet_use_system_jar,$(1),$(RHINO_JAR))
+endef
+
+else # !SYSTEM_RHINO
+
+define gb_JavaClassSet__use_rhino
+$(call gb_JavaClassSet_use_jar,$(1),$(OUTDIR)/bin/js.jar)
+endef
+
+endif # SYSTEM_RHINO
+
 # vim: set noet sw=4 ts=4:
-- 
cgit