[gnome-settings-daemon: 3/3] Merge branch 'marv/gnome-settings-daemon-build-without-wayland-fix'

[Carlos Garnacho <carlosg src gnome org>]

commit cba29e41e3ba8205ec3bcafd2e8aafeaa4d1a095
Merge: a093436e 51088a9c
Author: Carlos Garnacho <carlosg gnome org>
Date:   Fri Sep 21 20:13:15 2018 +0200

    Merge branch 'marv/gnome-settings-daemon-build-without-wayland-fix'

 meson.build                                 |  7 ++++---
 plugins/common/meson.build                  |  4 ++--
 plugins/media-keys/gsd-media-keys-manager.c | 16 ++++++++--------
 plugins/power/gsd-backlight-linux.c         |  4 ++--
 plugins/sharing/gsd-sharing-manager.c       | 20 ++++++++++----------
 5 files changed, 26 insertions(+), 25 deletions(-)
---
diff --cc meson.build
index e882d42c,247d1718..796da940
--- a/meson.build
+++ b/meson.build
@@@ -123,12 -123,9 +123,12 @@@ if enable_gude
    assert(enable_gudev, 'GUdev is not optional on Linux platforms')
    gudev_dep = dependency('gudev-1.0')
  endif
- config_h.set('HAVE_GUDEV', enable_gudev)
+ config_h.set10('HAVE_GUDEV', enable_gudev)
  
 +has_timerfd_create = cc.has_function('timerfd_create')
 +config_h.set10('HAVE_TIMERFD', has_timerfd_create)
 +
- # Check for libwayland-client
+ # Check for wayland dependencies
  enable_wayland = get_option('wayland')
  if enable_wayland
    assert(enable_gudev, 'GUDev support is required for wayland support.')