mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add --enable-ia2 configuration option

Browse Source 
Change-Id: I950c47bd95d5bb4aacf9e584c8e2eeef461af71f
This commit is contained in:
David Ostrovsky
2013-11-02 11:01:44 +01:00
committed by Michael Meeks
parent cd44cc1d22
commit b4f2dc2b64
3 changed files with 23 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
accessibility/Module_accessibility.mk Normal file → Executable file
View File

@@ -17,6 +17,7 @@ $(eval $(call gb_Module_add_l10n_targets,accessibility,\
AllLangResTarget_acc \ AllLangResTarget_acc \
)) ))
ifneq ($(ENABLE_IA2),TRUE)
ifneq ($(ENABLE_JAVA),) ifneq ($(ENABLE_JAVA),)
ifeq ($(OS),WNT) ifeq ($(OS),WNT)
$(eval $(call gb_Module_add_targets,accessibility,\ $(eval $(call gb_Module_add_targets,accessibility,\
@@ -27,5 +28,6 @@ $(eval $(call gb_Module_add_targets,accessibility,\
)) ))
endif endif
endif endif
endif
# vim:set noet sw=4 ts=4: # vim:set noet sw=4 ts=4:

1
config_host.mk.in Normal file → Executable file
View File

@@ -123,6 +123,7 @@ export ENABLE_GNOMEVFS=@ENABLE_GNOMEVFS@
export ENABLE_GRAPHITE=@ENABLE_GRAPHITE@ export ENABLE_GRAPHITE=@ENABLE_GRAPHITE@
export ENABLE_ORCUS=@ENABLE_ORCUS@ export ENABLE_ORCUS=@ENABLE_ORCUS@
export ENABLE_HARFBUZZ=@ENABLE_HARFBUZZ@ export ENABLE_HARFBUZZ=@ENABLE_HARFBUZZ@
export ENABLE_IA2=@ENABLE_IA2@
export ENABLE_GSTREAMER=@ENABLE_GSTREAMER@ export ENABLE_GSTREAMER=@ENABLE_GSTREAMER@
export ENABLE_GSTREAMER_0_10=@ENABLE_GSTREAMER_0_10@ export ENABLE_GSTREAMER_0_10=@ENABLE_GSTREAMER_0_10@
export ENABLE_GTK3=@ENABLE_GTK3@ export ENABLE_GTK3=@ENABLE_GTK3@

20
configure.ac Normal file → Executable file
View File

@@ -1308,6 +1308,11 @@ AC_ARG_ENABLE(library-bin-tar,
for the next time.]), for the next time.]),
) )
AC_ARG_ENABLE(ia2,
AS_HELP_STRING([--enable-ia2],
[Enable the Windows IAccessibility2. Disables Java Accessibility Bridge.]),
,)
dnl =================================================================== dnl ===================================================================
dnl Optional Packages (--with/without-) dnl Optional Packages (--with/without-)
dnl =================================================================== dnl ===================================================================
@@ -11566,6 +11571,21 @@ else
fi fi
AC_SUBST(ENABLE_ONLINE_UPDATE) AC_SUBST(ENABLE_ONLINE_UPDATE)
dnl ===================================================================
dnl Test whether to enable ia2
dnl ===================================================================
AC_MSG_CHECKING([whether to enable IA2])
ENABLE_IA2=
if test "$enable_ia2" = "yes"; then
if test "$_os" = "WINNT"; then
AC_MSG_RESULT([yes])
ENABLE_IA2="TRUE"
else
AC_MSG_RESULT([no])
fi
fi
AC_SUBST(ENABLE_IA2)
dnl =================================================================== dnl ===================================================================
dnl Test whether to create MSI with LIMITUI=1 (silent install) dnl Test whether to create MSI with LIMITUI=1 (silent install)
dnl =================================================================== dnl ===================================================================