From: Andrea Bolognani <abologna@redhat.com>
Date: Tue, 18 Aug 2020 23:39:18 +0000 (+0200)
Subject: meson: Set WITH_APPARMOR_PROFILES
X-Git-Tag: v6.7.0-rc1~84
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6724c09cb337508e8987b8599c3938e0488872fa;p=thirdparty%2Flibvirt.git

meson: Set WITH_APPARMOR_PROFILES

This variable is used in src/security/meson.build to decide
whether to install the AppArmor profiles, and at the moment
even when the user specifies -Dapparmor_profiles=true they
don't get installed.

Signed-off-by: Andrea Bolognani <abologna@redhat.com>
Reviewed-by: Christian Ehrhardt <christian.ehrhardt@canonical.com>
---

diff --git a/meson.build b/meson.build
index a72d0c0e85..c10b63ba69 100644
--- a/meson.build
+++ b/meson.build
@@ -966,6 +966,9 @@ 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', '/etc/apparmor.d')
   conf.set_quoted('APPARMOR_PROFILES_PATH', '/sys/kernel/security/apparmor/profiles')