45 lines
1.7 KiB
Diff
45 lines
1.7 KiB
Diff
|
From 1be0810b695a88407bca084a12063b78a719345e Mon Sep 17 00:00:00 2001
|
||
|
|
From: Benjamin Berg <bberg@redhat.com>
|
||
|
|
Date: Tue, 24 May 2022 15:31:31 +0200
|
||
|
|
Subject: [PATCH 05/14] meson: Add option to use libelogind for DBus
|
||
|
|
|
||
|
|
Co-authored-by: Matthew Thode <prometheanfire@gentoo.org>
|
||
|
|
Co-authored-by: Fabio Bas <fabio.bas@officineinformatiche.net>
|
||
|
|
---
|
||
|
|
meson.build | 2 +-
|
||
|
|
meson_options.txt | 5 +++++
|
||
|
|
2 files changed, 6 insertions(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/meson.build b/meson.build
|
||
|
|
index 159f0e8..93f9655 100644
|
||
|
|
--- a/meson.build
|
||
|
|
+++ b/meson.build
|
||
|
|
@@ -92,7 +92,7 @@ gmodule_dep = dependency('gmodule-2.0', version: '>=' + glib_min_version)
|
||
|
|
libfprint_dep = dependency('libfprint-2', version: '>=' + libfprint_min_version)
|
||
|
|
polkit_gobject_dep = dependency('polkit-gobject-1', version: '>= 0.91')
|
||
|
|
dbus_dep = dependency('dbus-1', required: false)
|
||
|
|
-libsystemd_dep = dependency('libsystemd', required: get_option('pam'))
|
||
|
|
+libsystemd_dep = dependency(get_option('libsystemd'), required: get_option('pam'))
|
||
|
|
pam_dep = cc.find_library('pam',
|
||
|
|
required: get_option('pam'),
|
||
|
|
has_headers: 'security/pam_modules.h',
|
||
|
|
diff --git a/meson_options.txt b/meson_options.txt
|
||
|
|
index 5daa9a4..11aa0be 100644
|
||
|
|
--- a/meson_options.txt
|
||
|
|
+++ b/meson_options.txt
|
||
|
|
@@ -10,6 +10,11 @@ option('systemd',
|
||
|
|
description: 'Install system service files',
|
||
|
|
type: 'boolean',
|
||
|
|
value: true)
|
||
|
|
+option('libsystemd',
|
||
|
|
+ description: 'Libsystemd provider (libsystemd or libelogind)',
|
||
|
|
+ type: 'combo',
|
||
|
|
+ choices: [ 'libsystemd', 'libelogind' ],
|
||
|
|
+ value: 'libsystemd')
|
||
|
|
option('systemd_system_unit_dir',
|
||
|
|
description: 'Directory for systemd service files',
|
||
|
|
type: 'string')
|
||
|
|
--
|
||
|
|
2.37.1.windows.1
|
||
|
|
|