[gtk: 7/7] Merge branch 'issue-2' into 'master'

[Matthias Clasen <matthiasc src gnome org>]

commit 753138a7cc3814ee811eb0dd28e3b3c61cde063c
Merge: 716f7cd3f7 327e7a4ccc
Author: Matthias Clasen <mclasen redhat com>
Date:   Thu Feb 15 02:58:16 2018 +0000

    Merge branch 'issue-2' into 'master'
    
    Update the configuration options
    
    Closes #2
    
    See merge request GNOME/gtk!11

 meson.build                            | 30 ++++++++++-------
 meson_options.txt                      | 59 ++++++++++++++++++----------------
 modules/input/meson.build              | 24 +++++---------
 modules/printbackends/cups/meson.build |  2 +-
 modules/printbackends/meson.build      | 25 +++++++++++---
 5 files changed, 81 insertions(+), 59 deletions(-)
---