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 | |
| 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)
| -rw-r--r-- | Repository.mk | 7 | ||||
| -rw-r--r--[-rwxr-xr-x] | accessibility/Module_accessibility.mk | 2 | ||||
| -rw-r--r--[-rwxr-xr-x] | config_host.mk.in | 0 | ||||
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | scp2/source/ooo/file_ooo.scp | 2 |
5 files changed, 4 insertions, 8 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 \ ) \ ) \ )) diff --git a/accessibility/Module_accessibility.mk b/accessibility/Module_accessibility.mk index 5f2aa177ab0e..e5e090ca89ee 100755..100644 --- a/accessibility/Module_accessibility.mk +++ b/accessibility/Module_accessibility.mk @@ -17,7 +17,6 @@ $(eval $(call gb_Module_add_l10n_targets,accessibility,\ AllLangResTarget_acc \ )) -ifneq ($(ENABLE_IA2),TRUE) ifneq ($(ENABLE_JAVA),) ifeq ($(OS),WNT) $(eval $(call gb_Module_add_targets,accessibility,\ @@ -28,6 +27,5 @@ $(eval $(call gb_Module_add_targets,accessibility,\ )) endif endif -endif # vim:set noet sw=4 ts=4: diff --git a/config_host.mk.in b/config_host.mk.in index 49977f1833ca..49977f1833ca 100755..100644 --- a/config_host.mk.in +++ b/config_host.mk.in diff --git a/configure.ac b/configure.ac index b7c56fd4541e..e510bc6195f3 100644 --- a/configure.ac +++ b/configure.ac @@ -11613,7 +11613,6 @@ if test "$enable_ia2" = "yes"; then if test "$_os" = "WINNT"; then AC_MSG_RESULT([yes]) ENABLE_IA2="TRUE" - SCPDEFS="$SCPDEFS -DENABLE_IA2" else AC_MSG_RESULT([no]) fi diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp index 68eae2e6aa26..e8be2289d48a 100644 --- a/scp2/source/ooo/file_ooo.scp +++ b/scp2/source/ooo/file_ooo.scp @@ -315,7 +315,7 @@ STD_JAR_FILE( gid_File_Jar_Xmerge, xmerge ) STD_JAR_FILE( gid_File_Jar_Xmergebridge, XMergeBridge ) #endif -#if defined ENABLE_JAVA && defined WNT && !defined(ENABLE_IA2) +#if defined ENABLE_JAVA && defined WNT STD_JAR_FILE( gid_File_Jar_Accessbridge, java_uno_accessbridge ) #endif |