diff options
| author | David Ostrovsky <david@ostrovsky.org> | 2013-11-02 11:01:44 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2013-11-19 00:01:32 +0000 |
| commit | 23d44ef3a305da52bfa48b7710f51b4f248304c1 (patch) | |
| tree | 1f46d426ce177fd50438a580898f6cfb072d1c61 | |
| parent | Move to MPLv2 license headers, add modelines. (diff) | |
| download | core-23d44ef3a305da52bfa48b7710f51b4f248304c1.tar.gz core-23d44ef3a305da52bfa48b7710f51b4f248304c1.zip | |
Add --enable-ia2 configuration option
Change-Id: I950c47bd95d5bb4aacf9e584c8e2eeef461af71f
| -rwxr-xr-x[-rw-r--r--] | accessibility/Module_accessibility.mk | 2 | ||||
| -rwxr-xr-x[-rw-r--r--] | config_host.mk.in | 1 | ||||
| -rwxr-xr-x[-rw-r--r--] | configure.ac | 20 |
3 files changed, 23 insertions, 0 deletions
diff --git a/accessibility/Module_accessibility.mk b/accessibility/Module_accessibility.mk index e5e090ca89ee..5f2aa177ab0e 100644..100755 --- a/accessibility/Module_accessibility.mk +++ b/accessibility/Module_accessibility.mk @@ -17,6 +17,7 @@ $(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,\ @@ -27,5 +28,6 @@ $(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 42bc0023de9c..dc1b454192b6 100644..100755 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -123,6 +123,7 @@ export ENABLE_GNOMEVFS=@ENABLE_GNOMEVFS@ export ENABLE_GRAPHITE=@ENABLE_GRAPHITE@ export ENABLE_ORCUS=@ENABLE_ORCUS@ export ENABLE_HARFBUZZ=@ENABLE_HARFBUZZ@ +export ENABLE_IA2=@ENABLE_IA2@ export ENABLE_GSTREAMER=@ENABLE_GSTREAMER@ export ENABLE_GSTREAMER_0_10=@ENABLE_GSTREAMER_0_10@ export ENABLE_GTK3=@ENABLE_GTK3@ diff --git a/configure.ac b/configure.ac index 44dcde816d41..b75be239292f 100644..100755 --- a/configure.ac +++ b/configure.ac @@ -1308,6 +1308,11 @@ AC_ARG_ENABLE(library-bin-tar, for the next time.]), ) +AC_ARG_ENABLE(ia2, + AS_HELP_STRING([--enable-ia2], + [Enable the Windows IAccessibility2. Disables Java Accessibility Bridge.]), +,) + dnl =================================================================== dnl Optional Packages (--with/without-) dnl =================================================================== @@ -11567,6 +11572,21 @@ fi 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 Test whether to create MSI with LIMITUI=1 (silent install) dnl =================================================================== AC_MSG_CHECKING([whether to create MSI with LIMITUI=1 (silent install)]) |