From: Alexander Larsson <alexl@redhat.com>
Date: Fri, 11 Feb 2011 14:27:54 +0000 (+0100)
Subject: Merge branch 'master' into broadway
X-Git-Url: http://pileus.org/git/?p=~andy%2Fgtk;a=commitdiff_plain;h=d4add8cefa6fa5c29bdb50f18e31cbfbfb38cc2b

Merge branch 'master' into broadway
---

d4add8cefa6fa5c29bdb50f18e31cbfbfb38cc2b
diff --cc configure.ac
index bac94f563,d9fb2775b..417c3f29f
--- a/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 90b4520cd,1e51edd02..01d3232ce
--- a/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 = 		\