--enable-ia2 disables building java-bridge, so disable packaging it too

Change-Id: I7e3b2d47af9a9b91b22df43fc56cdfd3522de6d8

Repository.mk

@@ -554,13 +554,14 @@ $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \
 		dtrans \
 		fps \
 		ftransl \
-		$(if $(ENABLE_JAVA),java_uno_accessbridge) \
 		$(if $(DISABLE_ATL),,\
 			inprocserv \
 		) \
 		$(if $(ENABLE_IA2), \
-			UAccCOM \
-			winaccessibility \
+				UAccCOM \
+				winaccessibility \
+			, \
+				$(if $(ENABLE_JAVA),java_uno_accessbridge) \
 		) \
 	) \
 ))

configure.ac

@@ -11613,6 +11613,7 @@ 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
+#if defined ENABLE_JAVA && defined WNT && !defined(ENABLE_IA2)
 STD_JAR_FILE( gid_File_Jar_Accessbridge, java_uno_accessbridge )
 #endif