wayland: Update configure.ac to add now needed wayland-cursor

[~andy/gtk] / configure.ac

diff --git a/configure.ac b/configure.ac
index 9ea8533bb083596bd72bd6e048d3c8aeafa7945d..5e3b07186dac5439aab9e491c65d8a83c7b0fe55 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -10,7 +10,7 @@
 
 m4_define([gtk_major_version], [3])
 m4_define([gtk_minor_version], [5])
-m4_define([gtk_micro_version], [5])
+m4_define([gtk_micro_version], [7])
 m4_define([gtk_interface_age], [0])
 m4_define([gtk_binary_age],
           [m4_eval(100 * gtk_minor_version + gtk_micro_version)])
@@ -41,7 +41,7 @@ m4_define([gtk_binary_version], [3.0.0])
 # required versions of other packages
 m4_define([glib_required_version], [2.33.1])
 m4_define([pango_required_version], [1.30.0])
-m4_define([atk_required_version], [2.2.0])
+m4_define([atk_required_version], [2.5.3])
 m4_define([cairo_required_version], [1.10.0])
 m4_define([gdk_pixbuf_required_version], [2.26.0])
 m4_define([introspection_required_version], [1.32.0])
@@ -407,7 +407,7 @@ if test "x$enable_wayland_backend" == "xyes"; then
   have_gio_unix=yes
   GDK_WINDOWING="$GDK_WINDOWING
 #define GDK_WINDOWING_WAYLAND"
-  WAYLAND_PACKAGES="wayland-client xkbcommon "
+  WAYLAND_PACKAGES="wayland-client xkbcommon wayland-cursor"
   if test "x$enable_wayland_cairo_gl" == "xyes"; then
     WAYLAND_PACKAGES="$WAYLAND_PACKAGES wayland-egl egl"
   fi
@@ -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