diff options
| author | Marco Trevisan (Treviño) <mail@3v1n0.net> | 2020-08-28 13:47:49 +0200 |
|---|---|---|
| committer | Ray Strode <halfline@gmail.com> | 2020-08-31 13:20:25 +0000 |
| commit | aaf82e9e63112ec01de97d2c2568b2fccf8ccad2 (patch) | |
| tree | 395945d8c60c54973787fddc9dfc012c32388ee4 /meson.build | |
| parent | cbd156524587fc27e5ad594c223be03a3e257590 (diff) | |
| download | gdm-aaf82e9e63112ec01de97d2c2568b2fccf8ccad2.tar.gz | |
meson: When possible use systemd dirs to check for systemd utils
With meson 0.53 we can check whether a binary is in a specified path, as it
was possible with `AC_PATH_PROG`, so use it as we did before of meson switch
even if I'm not sure that this tool is shipped by most distros these days
Diffstat (limited to 'meson.build')
| -rw-r--r-- | meson.build | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/meson.build b/meson.build index 08aa1aff..2bb3982c 100644 --- a/meson.build +++ b/meson.build @@ -97,7 +97,17 @@ endif systemd_dep = dependency('systemd') libsystemd_dep = dependency('libsystemd') journald_dep = dependency('journald', required: get_option('systemd-journal')) -systemd_multiseat_x = find_program('systemd-multi-seat-x', required: false) +if meson.version().version_compare('>= 0.53') + systemd_multiseat_x = find_program('systemd-multi-seat-x', + required: false, + dirs: [ + systemd_dep.get_pkgconfig_variable('systemdutildir'), + '/lib/systemd', + '/usr/lib/systemd', + ]) +else + systemd_multiseat_x = find_program('systemd-multi-seat-x', required: false) +endif systemd_x_server = systemd_multiseat_x.found()? systemd_multiseat_x.path() : '/lib/systemd/systemd-multi-seat-x' # Plymouth plymouth_dep = dependency('ply-boot-client', required: get_option('plymouth')) |