From 24c901c76b4f658f6052a72da8edd0dde78d1a0a Mon Sep 17 00:00:00 2001 From: Valentin Vidic Date: Thu, 26 Mar 2026 21:30:47 +0100 Subject: [PATCH] Fix meson build warning. Also check if pam_wrapper is installed before running the test. ../login/meson.build:112: WARNING: Project does not target a minimum version but uses feature deprecated since '0.56.0': meson.build_root. use meson.project_build_root() or meson.global_build_root() instead. --- login/meson.build | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/login/meson.build b/login/meson.build index 96328c6..30d9c2c 100644 --- a/login/meson.build +++ b/login/meson.build @@ -93,7 +93,8 @@ if get_option('pam-glome') if get_option('tests') libpamtest = dependency('libpamtest', required : false) - if libpamtest.found() + pam_wrapper = dependency('pam_wrapper', required : false) + if libpamtest.found() and pam_wrapper.found() oldstyle_run_pamtest = cc.compiles('''#include #include void test() { run_pamtest(NULL, NULL, NULL, NULL); } @@ -109,9 +110,9 @@ if get_option('pam-glome') test('pam test', pam_test, env: [ 'LD_PRELOAD=libpam_wrapper.so', 'PAM_WRAPPER=1', 'PAM_WRAPPER_SERVICE_DIR=' + - join_paths(meson.build_root(), 'login', 'pam_service'), + join_paths(meson.project_build_root(), 'login', 'pam_service'), 'PAM_GLOME=' + - join_paths(meson.build_root(), 'login', 'pam_glome.so') ]) + join_paths(meson.project_build_root(), 'login', 'pam_glome.so') ]) endif endif endif