diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-11-21 14:53:57 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-11-21 16:03:36 +0100 |
| commit | af0909f1b88a47db1ea0ea53cdac59daee42db0b (patch) | |
| tree | 427693e4459c617d67c2b5a186f0512a672418f9 /Repository.mk | |
| parent | b8156a37a62722ba7ef97d511150ac2ec55523bd (diff) | |
--enable-ia2 no longer disables Java access bridge
Just install both; 448727e598ca0c35ee9cd6f2c25a847c8147943b already made
IA2 an experimental feature with fallback to Java access bridge if
experimental mode is disabled.
Change-Id: I4ca64adbc586bd87b4d28087709f5c2e02bf7990
(cherry picked from commit 31b91f6f8a7cacb062005d6ca2a7b5b2645a9799)
Diffstat (limited to 'Repository.mk')
| -rw-r--r-- | Repository.mk | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/Repository.mk b/Repository.mk index b31a8091aed8..eb02ae3cc985 100644 --- a/Repository.mk +++ b/Repository.mk @@ -557,11 +557,10 @@ $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \ $(if $(DISABLE_ATL),,\ inprocserv \ ) \ + $(if $(ENABLE_JAVA),java_uno_accessbridge) \ $(if $(ENABLE_IA2), \ - UAccCOM \ - winaccessibility \ - , \ - $(if $(ENABLE_JAVA),java_uno_accessbridge) \ + UAccCOM \ + winaccessibility \ ) \ ) \ )) |