45 lines
1.4 KiB
Diff
45 lines
1.4 KiB
Diff
|
From b04d4eb3e87da2627ac16364bc03bf6c2c452b8c Mon Sep 17 00:00:00 2001
|
||
|
|
From: Fabio Bas <fabio.bas@officineinformatiche.net>
|
||
|
|
Date: Tue, 24 May 2022 16:00:02 +0200
|
||
|
|
Subject: [PATCH 06/14] Permit build without pam_wrapper
|
||
|
|
|
||
|
|
---
|
||
|
|
meson.build | 5 ++++-
|
||
|
|
tests/pam/meson.build | 4 +++-
|
||
|
|
2 files changed, 7 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/meson.build b/meson.build
|
||
|
|
index 93f9655..859bcf2 100644
|
||
|
|
--- a/meson.build
|
||
|
|
+++ b/meson.build
|
||
|
|
@@ -137,7 +137,10 @@ endif
|
||
|
|
polkit_policy_directory = polkit_gobject_dep.get_pkgconfig_variable('policydir')
|
||
|
|
|
||
|
|
# Tests dependencies
|
||
|
|
-pam_wrapper_dep = dependency('pam_wrapper', required: get_option('pam'))
|
||
|
|
+pam_wrapper_dep = dependency('pam_wrapper', required: false)
|
||
|
|
+if get_option('pam') and not pam_wrapper_dep.found()
|
||
|
|
+ warning('Dependency "pam_wrapper" required by test suite not found')
|
||
|
|
+endif
|
||
|
|
|
||
|
|
xmllint = find_program('xmllint', required: false)
|
||
|
|
python3 = find_program('python3') # No meson without it!
|
||
|
|
diff --git a/tests/pam/meson.build b/tests/pam/meson.build
|
||
|
|
index dc0b071..bb3c1d9 100644
|
||
|
|
--- a/tests/pam/meson.build
|
||
|
|
+++ b/tests/pam/meson.build
|
||
|
|
@@ -12,7 +12,9 @@ if address_sanitizer
|
||
|
|
preloaded_libs += 'asan'
|
||
|
|
endif
|
||
|
|
|
||
|
|
-preloaded_libs += 'pam_wrapper'
|
||
|
|
+if pam_wrapper_dep.found()
|
||
|
|
+ preloaded_libs += 'pam_wrapper'
|
||
|
|
+endif
|
||
|
|
|
||
|
|
foreach libname: preloaded_libs
|
||
|
|
lib = run_command(meson.get_compiler('c'),
|
||
|
|
--
|
||
|
|
2.37.1.windows.1
|
||
|
|
|