Repository.mk | 7 +++----
accessibility/Module_accessibility.mk | 2 --
configure.ac | 1 -
scp2/source/ooo/file_ooo.scp | 2 +-
4 files changed, 4 insertions(+), 8 deletions(-)
New commits:
commit 31b91f6f8a7cacb062005d6ca2a7b5b2645a9799
Author: Michael Stahl <mst...@redhat.com>
Date: Thu Nov 21 14:53:57 2013 +0100
--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
diff --git a/Repository.mk b/Repository.mk
index 94ce0ce..1fdd9b2 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 \
) \
) \
))
diff --git a/accessibility/Module_accessibility.mk
b/accessibility/Module_accessibility.mk
old mode 100755
new mode 100644
index 5f2aa17..e5e090c
--- 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
old mode 100755
new mode 100644
diff --git a/configure.ac b/configure.ac
index dc7be27..e3615d9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11617,7 +11617,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 68eae2e..e8be228 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
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
