summaryrefslogtreecommitdiff
path: root/Repository.mk
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2013-11-21 14:53:57 +0100
committerMichael Stahl <mstahl@redhat.com>2013-11-21 15:14:43 +0100
commit31b91f6f8a7cacb062005d6ca2a7b5b2645a9799 (patch)
treebf3625c2828d4f29a4cf2f0d93e60b67c9352f78 /Repository.mk
parent4d6a248ca3f99c961e204b3fd66372501eb3872d (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
Diffstat (limited to 'Repository.mk')
-rw-r--r--Repository.mk7
1 files changed, 3 insertions, 4 deletions
diff --git a/Repository.mk b/Repository.mk
index 94ce0ce8cdef..1fdd9b2a1921 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -549,11 +549,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 \
) \
) \
))