[gtk/gtk-3-24: 2/2] Merge branch 'gtk3-meson-finish' into 'gtk-3-24'

[Matthias Clasen <matthiasc src gnome org>]

commit 093f806f59365e417fb393c41b0d42766ca70c25
Merge: 47da5607e1 94555371f5
Author: Matthias Clasen <mclasen redhat com>
Date:   Mon Jun 17 17:50:42 2019 +0000

    Merge branch 'gtk3-meson-finish' into 'gtk-3-24'
    
    gtk3 meson port not-so-final touches
    
    See merge request GNOME/gtk!940

 gdk/meson.build                   |  2 +-
 gdk/mir/Makefile.am               |  3 +++
 gdk/mir/meson.build               |  1 +
 meson.build                       | 11 ++++++++---
 meson_options.txt                 |  4 ++++
 modules/printbackends/meson.build |  7 +++++++
 testsuite/meson.build             |  4 ++++
 7 files changed, 28 insertions(+), 4 deletions(-)
---