From e5aca34f01a53ee7fcbb0f4504cbb761fc3c5c08 Mon Sep 17 00:00:00 2001 From: Pavel Hrdina Date: Thu, 25 Jun 2020 15:50:14 +0200 Subject: [PATCH] meson: src: define secdriver_dep Signed-off-by: Pavel Hrdina Reviewed-by: Peter Krempa Reviewed-by: Neal Gompa --- src/Makefile.am | 12 ------------ src/meson.build | 11 +++++++++++ 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 277f4d1e12..8b679f610b 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -106,18 +106,6 @@ include storage/Makefile.inc.am include remote/Makefile.inc.am -SECDRIVER_CFLAGS = -SECDRIVER_LIBS = -if WITH_SECDRIVER_SELINUX -SECDRIVER_CFLAGS += $(SELINUX_CFLAGS) -SECDRIVER_LIBS += $(SELINUX_LIBS) -endif WITH_SECDRIVER_SELINUX -if WITH_SECDRIVER_APPARMOR -SECDRIVER_CFLAGS += $(APPARMOR_CFLAGS) -SECDRIVER_LIBS += $(APPARMOR_LIBS) -endif WITH_SECDRIVER_APPARMOR - - moddir = $(libdir)/libvirt/connection-driver confdir = $(sysconfdir)/libvirt diff --git a/src/meson.build b/src/meson.build index 9f042c9d84..83e22d5d43 100644 --- a/src/meson.build +++ b/src/meson.build @@ -23,3 +23,14 @@ src_dep = declare_dependency( + win32_link_flags ), ) + + +# define secdriver_dep + +secdriver_dep = [] +if conf.has('WITH_SECDRIVER_SELINUX') + secdriver_dep += selinux_dep +endif +if conf.has('WITH_SECDRIVER_APPARMOR') + secdriver_dep += apparmor_dep +endif