From ed8203e700aa8a8de40df071ffdc2d18cab68e29 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Tue, 26 Jun 2012 09:41:33 -0400
Subject: [PATCH] build: Drop --without-atk-bridge option

Instead, always build it if and only if X11.  This reduces the set of
supported configurations.

https://bugzilla.gnome.org/show_bug.cgi?id=677491
---
 configure.ac    | 7 +------
 gtk/a11y/gail.c | 4 ++--
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/configure.ac b/configure.ac
index d4c2262d24..37b6349b8b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1281,13 +1281,8 @@ AC_SUBST(GDK_DEP_CFLAGS)
 # Check for Accessibility Toolkit flags
 ########################################
 
-AC_ARG_WITH(atk-bridge,
-	    AS_HELP_STRING([--without-atk-bridge], [Do not use atk-bridge-2.0]),
-	    :, with_atk_bridge=$enable_x11_backend)
-
-if test x$with_atk_bridge != xno; then
+if test x$enable_x11_backend = xyes; then
    ATK_PACKAGES="atk atk-bridge-2.0"
-   AC_DEFINE([HAVE_ATK_BRIDGE], [1], [Define if we're using atk-bridge-2.0])
 else
    ATK_PACKAGES="atk"
 fi
diff --git a/gtk/a11y/gail.c b/gtk/a11y/gail.c
index 4f5028b040..ff8450ac04 100644
--- a/gtk/a11y/gail.c
+++ b/gtk/a11y/gail.c
@@ -33,7 +33,7 @@
 #include "gailutil.h"
 #include "gailmisc.h"
 
-#ifdef HAVE_ATK_BRIDGE
+#ifdef GDK_WINDOWING_X11
 #include <atk-bridge.h>
 #endif
 
@@ -809,7 +809,7 @@ _gtk_accessibility_init (void)
   focus_tracker_id = atk_add_focus_tracker (gail_focus_tracker);
 
   _gail_util_install ();
-#ifdef HAVE_ATK_BRIDGE
+#ifdef GDK_WINDOWING_X11
   atk_bridge_adaptor_init (NULL, NULL);
 #endif