Merge branch 'master' into broadway

diff --cc configure.ac
index bac94f563fca2e668dcb9087f3621e2ab7ec5966,d9fb2775ba1b3ef86c8c856ea4b997cbdd3cfa53..417c3f29f4d7b2e025d4de24e954fe80134ec2d4
--- 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(broadway-backend,
 +              [AC_HELP_STRING([--enable-broadway-backend],
 +                              [enable the broadway (HTML5) gdk backend])],
 +                            [backend_set=yes])
  
  if test -z "$backend_set"; then
    if test "$platform_win32" = yes; then

diff --cc gdk/Makefile.am
index 90b4520cd8afa1a4edf859d6c1abf765b97aa80b,1e51edd02b4e3cbe062042aebff09e58042d059d..01d3232ce6e5e186948ff2101616f7c5c477cf49
--- 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
  
 +if USE_BROADWAY
 +libgdk_3_0_la_LIBADD += broadway/libgdk-broadway.la
 +endif # USE_BROADWAY
 +
  if HAVE_INTROSPECTION
  
  introspection_files =                 \

diff --cc gdk/gdkdisplaymanager.c
Simple merge

diff --cc tests/testsocket_common.c
Simple merge