[gdm: 11/11] Merge branch 'meson-fixes' into 'master'

[Ray Strode <halfline src gnome org>]

commit 62d36172381147e5bff30b44eab3fdb09c9bc9cb
Merge: 5cafcd22 a798460a
Author: Ray Strode <halfline gmail com>
Date:   Mon Aug 31 13:28:02 2020 +0000

    Merge branch 'meson-fixes' into 'master'
    
    Meson fixes
    
    See merge request GNOME/gdm!107

 README.md                   |  7 ++---
 data/gnome-login.session.in |  3 +-
 data/meson.build            | 49 ++++++++++++++++++++++++-----
 data/session.conf           | 19 -----------
 data/session.conf.in        |  4 +++
 meson.build                 | 77 +++++++++++++++++++++++++++++++++++++++++----
 meson_options.txt           |  2 +-
 7 files changed, 122 insertions(+), 39 deletions(-)
---