AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

build: Drop --without-atk-bridge option

Browse Source 
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
This commit is contained in:
Colin Walters 2012-06-26 09:41:33 -04:00
parent e393fdeedd
commit ed8203e700
2 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
configure.ac
View File

@ -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

4
gtk/a11y/gail.c
View File

@ -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