[gdm: 3/4] build: Remove some now-unnecessary meson conditionals
- From: Ray Strode <halfline src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gdm: 3/4] build: Remove some now-unnecessary meson conditionals
- Date: Mon, 26 Sep 2022 19:46:41 +0000 (UTC)
commit 4b4df2adf240e8b193fbaaba72209de12e290235
Author: Matt Turner <mattst88 gmail com>
Date: Mon Aug 29 12:51:38 2022 -0400
build: Remove some now-unnecessary meson conditionals
meson.build | 20 +++++++-------------
1 file changed, 7 insertions(+), 13 deletions(-)
---
diff --git a/meson.build b/meson.build
index be0594177..d8df021b6 100644
--- a/meson.build
+++ b/meson.build
@@ -102,17 +102,13 @@ endif
# systemd
systemd_dep = dependency('systemd')
libsystemd_dep = dependency('libsystemd')
-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_multiseat_x = find_program('systemd-multi-seat-x',
+ required: false,
+ dirs: [
+ systemd_dep.get_pkgconfig_variable('systemdutildir'),
+ '/lib/systemd',
+ '/usr/lib/systemd',
+ ])
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'))
@@ -285,7 +281,6 @@ gnome.post_install(
glib_compile_schemas: true,
)
-if meson.version().version_compare('>= 0.53')
summary({
'datadir': gdm_prefix / get_option('datadir'),
'sysconfdir': gdm_prefix / get_option('sysconfdir'),
@@ -338,4 +333,3 @@ summary({
section: 'Features',
bool_yn: true,
)
-endif
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]