diff options
| author | Robert Ancell <robert.ancell@canonical.com> | 2014-05-20 10:03:30 +1200 |
|---|---|---|
| committer | Ryan Lortie <desrt@desrt.ca> | 2014-10-22 11:17:15 -0500 |
| commit | 0f26b26f1d93f002ccd5fe6b6fd636172bfbb24b (patch) | |
| tree | cf89d4be41144af92e9ec49b1b6e05cba1e02320 /configure.ac | |
| parent | 4e66cca58d3610e08a5309afba243ccdf0f78007 (diff) | |
| download | gtk+-0f26b26f1d93f002ccd5fe6b6fd636172bfbb24b.tar.gz | |
Gdk: add an experimental backend for mir
This is disabled by default. Enable with --enable-mir-backend.
This backend is a combined work of Robert Ancell and Ryan Lortie.
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 34 |
1 files changed, 32 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index d614dde0d7..4870bfc887 100644 --- a/configure.ac +++ b/configure.ac @@ -330,6 +330,10 @@ AC_ARG_ENABLE(wayland-backend, [AS_HELP_STRING([--enable-wayland-backend], [enable the wayland gdk backend])], [backend_set=yes]) +AC_ARG_ENABLE(mir-backend, + [AS_HELP_STRING([--enable-mir-backend], + [enable the Mir gdk backend])], + [backend_set=yes]) if test -z "$backend_set"; then if test "$platform_win32" = yes; then @@ -337,6 +341,7 @@ if test -z "$backend_set"; then else enable_x11_backend=yes enable_wayland_backend=maybe + enable_mir_backend=no fi fi @@ -459,6 +464,30 @@ else AM_CONDITIONAL(USE_WAYLAND, false) fi +MIR_DEPENDENCIES="mirclient" +if test "$enable_mir_backend" = "maybe" ; then + PKG_CHECK_EXISTS($MIR_DEPENDENCIES, [have_mir_deps=yes], [have_mir_deps=no]) + AC_MSG_CHECKING([for MIR_DEPENDENCIES]) + if test "$have_mir_deps" = "no" ; then + enable_mir_backend=no + else + enable_mir_backend=yes + fi + AC_MSG_RESULT($enable_mir_backend) +fi + +if test "$enable_mir_backend" = "yes"; then + cairo_backends="$cairo_backends cairo" + GDK_BACKENDS="$GDK_BACKENDS mir" + GDK_WINDOWING="$GDK_WINDOWING +#define GDK_WINDOWING_MIR" + MIR_PACKAGES="$MIR_DEPENDENCIES" + + AM_CONDITIONAL(USE_MIR, true) +else + AM_CONDITIONAL(USE_MIR, false) +fi + # strip leading space GDK_BACKENDS=${GDK_BACKENDS#* } @@ -1328,7 +1357,7 @@ CFLAGS="$saved_cflags" LDFLAGS="$saved_ldflags" GDK_PACKAGES="$PANGO_PACKAGES gdk-pixbuf-2.0 >= gdk_pixbuf_required_version cairo >= cairo_required_version cairo-gobject >= cairo_required_version" -GDK_PRIVATE_PACKAGES="$GDK_GIO_PACKAGE $X_PACKAGES $WAYLAND_PACKAGES $cairo_backends epoxy >= epoxy_required_version" +GDK_PRIVATE_PACKAGES="$GDK_GIO_PACKAGE $X_PACKAGES $WAYLAND_PACKAGES $MIR_PACKAGES $cairo_backends epoxy >= epoxy_required_version" if test "x$enable_x11_backend" = xyes; then GDK_PRIVATE_PACKAGES="$GDK_PRIVATE_PACKAGES pangoft2" fi @@ -1365,7 +1394,7 @@ fi PKG_CHECK_MODULES(ATK, $ATK_PACKAGES) GTK_PACKAGES="atk >= atk_required_version cairo >= cairo_required_version cairo-gobject >= cairo_required_version gdk-pixbuf-2.0 >= gdk_pixbuf_required_version gio-2.0 >= glib_required_version" -GTK_PRIVATE_PACKAGES="$ATK_PACKAGES" +GTK_PRIVATE_PACKAGES="$ATK_PACKAGES $WAYLAND_PACKAGES $MIR_PACKAGES" if test "x$enable_x11_backend" = xyes; then GTK_PRIVATE_PACKAGES="$GTK_PRIVATE_PACKAGES pangoft2" fi @@ -1915,6 +1944,7 @@ gdk/win32/rc/Makefile gdk/win32/rc/gdk.rc gdk/quartz/Makefile gdk/wayland/Makefile +gdk/mir/Makefile gdk/gdkversionmacros.h gtk/Makefile gtk/makefile.msc |