AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-11-05 16:20:10 +00:00
Code Issues Projects Releases Wiki Activity

build: Add --without-atk-bridge, only check for it on X11 platforms

Browse Source 
Some builders using gtk3 outside of the GNOME cycle want an option to
avoid linking to atk-bridge-2.0.  Provide that, and at the same time
ensure we're only looking for it on X11 platforms.

https://bugzilla.gnome.org/show_bug.cgi?id=677491
This commit is contained in:
Colin Walters 2012-06-22 13:29:03 -04:00 committed by Matthias Clasen
parent 44fd03eb47
commit 71e0e72c69
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
configure.ac
View File

@ -1278,11 +1278,21 @@ AC_SUBST(GDK_DEP_CFLAGS)
# Check for Accessibility Toolkit flags
########################################
ATK_PACKAGES="atk atk-bridge-2.0"
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
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
PKG_CHECK_MODULES(ATK, $ATK_PACKAGES)
GTK_PACKAGES="atk cairo cairo-gobject gdk-pixbuf-2.0 gio-2.0"
GTK_PRIVATE_PACKAGES="atk-bridge-2.0"
GTK_PRIVATE_PACKAGES="$ATK_PACKAGES"
if test "x$enable_x11_backend" = xyes; then
GTK_PRIVATE_PACKAGES="$GTK_PRIVATE_PACKAGES pangoft2"
fi

4
gtk/a11y/gail.c
View File

@ -33,7 +33,9 @@
#include "gailutil.h"
#include "gailmisc.h"
#ifdef HAVE_ATK_BRIDGE
#include <atk-bridge.h>
#endif
static gboolean gail_focus_watcher (GSignalInvocationHint *ihint,
guint n_param_values,
@ -807,7 +809,9 @@ _gtk_accessibility_init (void)
focus_tracker_id = atk_add_focus_tracker (gail_focus_tracker);
_gail_util_install ();
#ifdef HAVE_ATK_BRIDGE
atk_bridge_adaptor_init (NULL, NULL);
#endif
atk_misc_instance = g_object_new (GAIL_TYPE_MISC, NULL);
}