[sushi: 2/2] Merge branch 'meson_fixes' into 'master'

[Cosimo Cecchi <cosimoc src gnome org>]

commit 9494499738aedea3d594a2bfdffef56a84209f25
Merge: 74e9596 2e96071
Author: Cosimo Cecchi <cosimo cecchi gmail com>
Date:   Mon Dec 2 00:27:38 2019 +0000

    Merge branch 'meson_fixes' into 'master'
    
    meson: make X11 and Wayland configurable
    
    See merge request GNOME/sushi!13

 meson.build       | 6 +++---
 meson_options.txt | 8 ++++++++
 2 files changed, 11 insertions(+), 3 deletions(-)
---