From 090e8076a995ad397b0366b80b70eb9c8645b83c Mon Sep 17 00:00:00 2001 From: Andrea Bolognani Date: Thu, 27 May 2021 15:17:19 +0200 Subject: [PATCH] meson: Rewrite apparmor_profiles check Attempting to enable apparmor_profiles when apparmor support is not enabled should result in an error. Signed-off-by: Andrea Bolognani Reviewed-by: Pavel Hrdina --- meson.build | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/meson.build b/meson.build index adac7f39bb..c3d0c190a9 100644 --- a/meson.build +++ b/meson.build @@ -852,14 +852,18 @@ endif apparmor_dep = dependency('libapparmor', required: get_option('apparmor')) if apparmor_dep.found() - if get_option('apparmor_profiles') - conf.set('WITH_APPARMOR_PROFILES', 1) - endif conf.set('WITH_APPARMOR', 1) conf.set_quoted('APPARMOR_DIR', sysconfdir / 'apparmor.d') conf.set_quoted('APPARMOR_PROFILES_PATH', '/sys/kernel/security/apparmor/profiles') endif +if get_option('apparmor_profiles') + if not conf.has('WITH_APPARMOR') + error('Cannot enable apparmor_profiles without apparmor') + endif + conf.set('WITH_APPARMOR_PROFILES', 1) +endif + # FIXME rewrite to use dependency() once we can use 2.4.48 attr_dep = cc.find_library('attr', required: get_option('attr')) if attr_dep.found()