X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=configure.ac;h=d33aeec6c2bec6e8ee4941445e723274afc90122;hb=590f3dfa1fcb812e4c334f574c6bb0431b131d04;hp=71589c1df2cf6ab7496b436f27a21aad21cf59b9;hpb=bfaf472e703a5378fe8e6b59e116e28dea7ccace;p=~andy%2Fgtk diff --git a/configure.ac b/configure.ac index 71589c1df..d33aeec6c 100644 --- a/configure.ac +++ b/configure.ac @@ -290,6 +290,10 @@ AC_ARG_ENABLE(quartz-backend, [AC_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 @@ -345,6 +349,19 @@ else AM_CONDITIONAL(USE_QUARTZ, false) fi +if test "x$enable_wayland_backend" == "xyes"; then + # Wayland uses cairo-gl + cairo_backends="$cairo_backends cairo-gl" + GDK_BACKENDS="$GDK_BACKENDS wayland" + GIO_PACKAGE=gio-unix-2.0 + GDK_WINDOWING="$GDK_WINDOWING +#define GDK_WINDOWING_WAYLAND" + WAYLAND_PACKAGES="wayland-client xkbcommon" + AM_CONDITIONAL(USE_WAYLAND, true) +else + AM_CONDITIONAL(USE_WAYLAND, false) +fi + # strip leading space GDK_BACKENDS=${GDK_BACKENDS/# } @@ -1244,7 +1261,7 @@ fi CFLAGS="$saved_cflags" LDFLAGS="$saved_ldflags" -GDK_PACKAGES="$PANGO_PACKAGES $GIO_PACKAGE $X_PACKAGES gdk-pixbuf-2.0 $cairo_backends cairo-gobject" +GDK_PACKAGES="$PANGO_PACKAGES $GIO_PACKAGE $X_PACKAGES $WAYLAND_PACKAGES gdk-pixbuf-2.0 $cairo_backends cairo-gobject" GDK_DEP_LIBS="$GDK_EXTRA_LIBS `$PKG_CONFIG --libs $GDK_PACKAGES`" GDK_DEP_CFLAGS="`$PKG_CONFIG --cflags gthread-2.0 $GDK_PACKAGES` $GDK_EXTRA_CFLAGS" @@ -1668,6 +1685,7 @@ gdk/win32/Makefile gdk/win32/rc/Makefile gdk/win32/rc/gdk.rc gdk/quartz/Makefile +gdk/wayland/Makefile gdk/tests/Makefile gtk/Makefile gtk/makefile.msc