--enable-ia2 no longer disables Java access bridge

Just install both; 448727e5 already made
IA2 an experimental feature with fallback to Java access bridge if
experimental mode is disabled.

Change-Id: I4ca64adbc586bd87b4d28087709f5c2e02bf7990
(cherry picked from commit 31b91f6f)

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 \
 		) \
 	) \
 ))

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:

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

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