@@ -, +, @@ 
 -Denable-atk-bridge=false
---
 config.h.meson              | 3 +++
 gtk/a11y/gtkaccessibility.c | 4 ++--
 meson.build                 | 7 +++++--
 meson_options.txt           | 2 ++
 4 files changed, 12 insertions(+), 4 deletions(-)
--- b/config.h.meson	
+++ b/config.h.meson	
@@ -12,6 +12,9 @@ 
 /* Define the location where the catalogs will be installed */
 #mesondefine GTK_LOCALEDIR
 
+/* Define if we're using atk-bridge-2.0 */
+#mesondefine HAVE_ATK_BRIDGE
+
 /* Define to 1 if you have the `bind_textdomain_codeset' function. */
 #mesondefine HAVE_BIND_TEXTDOMAIN_CODESET
 
--- b/gtk/a11y/gtkaccessibility.c	
+++ b/gtk/a11y/gtkaccessibility.c	
@@ -35,7 +35,7 @@ 
 #include <gtk/gtktogglebutton.h>
 #include <gtk/gtkaccessible.h>
 
-#ifdef GDK_WINDOWING_X11
+#ifdef HAVE_ATK_BRIDGE
 #include <atk-bridge.h>
 #endif
 
@@ -988,7 +988,7 @@ _gtk_accessibility_init (void)
   _gtk_accessibility_override_atk_util ();
   do_window_event_initialization ();
 
-#ifdef GDK_WINDOWING_X11
+#ifdef HAVE_ATK_BRIDGE
   atk_bridge_adaptor_init (NULL, NULL);
 #endif
 
--- b/meson.build	
+++ b/meson.build	
@@ -434,7 +434,6 @@ if x11_enabled
   xfixes_dep     = dependency('xfixes', required: false)
   xcomposite_dep = dependency('xcomposite', required: false)
   fontconfig_dep = dependency('fontconfig')
-  atkbridge_dep  = dependency('atk-bridge-2.0', version: atk_req)
 
   backend_immodules += ['xim']
 
@@ -453,7 +452,11 @@ if x11_enabled
     x11_pkgs += ['xdamage']
   endif
 
-  atk_pkgs += ['atk-bridge-2.0']
+  if get_option('enable-atk-bridge')
+    atkbridge_dep = dependency('atk-bridge-2.0', version: atk_req)
+    atk_pkgs += ['atk-bridge-2.0']
+    cdata.set('HAVE_ATK_BRIDGE', 1)
+  endif
 
   cdata.set('HAVE_XDAMAGE', xdamage_dep.found())
   cdata.set('HAVE_XCURSOR', xcursor_dep.found())
--- b/meson_options.txt	
+++ b/meson_options.txt	
@@ -26,6 +26,8 @@ option('enable-cloudproviders', type: 'boolean', value: false,
   description : 'Enable the cloudproviders support')
 option('enable-xinerama', type: 'combo', choices : ['yes', 'no', 'auto'], value : 'auto',
   description : 'Enable support for the Xinerama extension')
+option('enable-atk-bridge', type: 'boolean', value: 'true',
+  description : 'Enable AT-SPI ATK bridge support (requires DBus)')
 option('disable-modules', type: 'boolean', value : 'false',
   description : 'Disable dynamic module loading')
 option('with-included-immodules', type: 'string', value : '',