From: Rosen Penev <rosenp@gmail.com>
Date: Mon, 2 May 2022 23:18:33 +0000 (-0700)
Subject: meson: make libcap-ng dependent on setpriv
X-Git-Tag: v2.39-rc1~674
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cd23a4336f49ba6a12ade557a09589f2a7c966f4;p=thirdparty%2Futil-linux.git

meson: make libcap-ng dependent on setpriv

Signed-off-by: Rosen Penev <rosenp@gmail.com>
---

diff --git a/meson.build b/meson.build
index 471f0c8d50..09479c4388 100644
--- a/meson.build
+++ b/meson.build
@@ -335,7 +335,8 @@ have = cc.has_function(
 conf.set('HAVE_CRYPT_ACTIVATE_BY_SIGNED_KEY', have ? 1 : false)
 
 lib_cap_ng = dependency(
-  'libcap-ng')
+  'libcap-ng',
+  required : get_option('build-setpriv'))
 
 lib_selinux = dependency(
   'libselinux',
@@ -1745,7 +1746,7 @@ if opt and not is_disabler(exe)
   exes += exe
 endif
 
-opt = not get_option('build-setpriv').disabled()
+opt = not get_option('build-setpriv').disabled() and lib_cap_ng.found()
 exe = executable(
   'setpriv',
   setpriv_sources,