Merge remote-tracking branch 'origin/master' into gdk-backend-wayland

Conflicts:
	gdk/gdkdisplaymanager.c

diff --cc configure.ac
index 1b13ba39424ef6b55cea935d505d3657c31581a7,4215ccc1272be3a539023e1d0d87633155a303f2..a37651a29f42e28ed177af1e1e76c1c9a79554a0
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -287,13 -294,9 +294,13 @@@ AC_ARG_ENABLE(win32-backend
                                [enable the Win32 gdk backend])],
                              [backend_set=yes])
  AC_ARG_ENABLE(quartz-backend,
-               [AC_HELP_STRING([--enable-quartz-backend],
+               [AS_HELP_STRING([--enable-quartz-backend],
                                [enable the quartz gdk backend])],
                              [backend_set=yes])
 +AC_ARG_ENABLE(wayland-backend,
 +              [AC_HELP_STRING([--enable-wayland-backend],
 +                              [enable the wayland gdk backend])],
 +                            [backend_set=yes])
  
  if test -z "$backend_set"; then
    if test "$platform_win32" = yes; then

diff --cc gdk/Makefile.am
index 91fcbb0531adfed32a531e30aa9cff4e917b813a,1e51edd02b4e3cbe062042aebff09e58042d059d..cfacc2a3d8a066c65e5a362c9543f1689f65ace2
--- 1/gdk/Makefile.am
--- 2/gdk/Makefile.am
+++ b/gdk/Makefile.am
@@@ -170,16 -170,12 +170,16 @@@ libgdk_3_la_LIBADD += quartz/libgdk-qua
  endif # USE_QUARTZ
  
  if USE_WIN32
- libgdk_3_0_la_SOURCES += gdkkeynames.c
- libgdk_3_0_la_LIBADD += win32/libgdk-win32.la
- libgdk_3_0_la_DEPENDENCIES = win32/libgdk-win32.la win32/rc/gdk-win32-res.o gdk.def
- libgdk_3_0_la_LDFLAGS += -Wl,win32/rc/gdk-win32-res.o -export-symbols $(srcdir)/gdk.def
+ libgdk_3_la_SOURCES += gdkkeynames.c
+ libgdk_3_la_LIBADD += win32/libgdk-win32.la
+ libgdk_3_la_DEPENDENCIES = win32/libgdk-win32.la win32/rc/gdk-win32-res.o gdk.def
+ libgdk_3_la_LDFLAGS += -Wl,win32/rc/gdk-win32-res.o -export-symbols $(srcdir)/gdk.def
  endif # USE_WIN32
  
- libgdk_3_0_la_LIBADD += wayland/libgdk-wayland.la
 +if USE_WAYLAND
++libgdk_3_la_LIBADD += wayland/libgdk-wayland.la
 +endif
 +
  if HAVE_INTROSPECTION
  
  introspection_files =                 \

diff --cc gdk/gdkdisplaymanager.c
index f5bbc9508b1e7db9b04f5a631604c0d707325f32,1c442045f9e04ba3eb06419ec1e41c2e723c221b..6a2d071af6981a66bb2d65eac4d8a78374113c2f
--- 1/gdk/gdkdisplaymanager.c
--- 2/gdk/gdkdisplaymanager.c
+++ b/gdk/gdkdisplaymanager.c
@@@ -207,10 -235,10 +239,15 @@@ gdk_display_manager_get (void
          manager = g_object_new (gdk_win32_display_manager_get_type (), NULL);
        else
  #endif
 +#ifdef GDK_WINDOWING_WAYLAND
 +      if (backend == NULL || strcmp (backend, "wayland") == 0)
 +        manager = g_object_new (gdk_wayland_display_manager_get_type (), NULL);
 +      else
++#endif
+ #ifdef GDK_WINDOWING_X11
+       if (backend == NULL || strcmp (backend, "x11") == 0)
+         manager = g_object_new (gdk_x11_display_manager_get_type (), NULL);
+       else
  #endif
        if (backend != NULL)
          g_error ("Unsupported GDK backend: %s", backend);

diff --cc gtk/gtkwindow.c
Simple merge