From: Thomas Weißschuh <thomas@t-8ch.de>
Date: Wed, 11 Oct 2023 14:35:45 +0000 (+0200)
Subject: meson: don't try to build test_ca without libcap-ng
X-Git-Tag: v2.40-rc1~205^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=512c91a64706ae15bbf8d5fc609b9aaa2af15346;p=thirdparty%2Futil-linux.git

meson: don't try to build test_ca without libcap-ng

Signed-off-by: Thomas Weißschuh <thomas@t-8ch.de>
---

diff --git a/meson.build b/meson.build
index 281bda19e0..aaaddbe51e 100644
--- a/meson.build
+++ b/meson.build
@@ -377,6 +377,9 @@ conf.set('HAVE_CRYPT_ACTIVATE_BY_SIGNED_KEY', have ? 1 : false)
 lib_cap_ng = dependency(
   'libcap-ng',
   required : get_option('build-setpriv'))
+if not lib_cap_ng.found()
+  lib_cap_ng = disabler()
+endif
 
 lib_selinux = dependency(
   'libselinux',
@@ -3316,7 +3319,9 @@ exe = executable(
   include_directories : includes,
   dependencies : [lib_cap_ng],
   build_by_default: program_tests)
-exes += exe
+if not is_disabler(exe)
+  exes += exe
+endif
 
 exe = executable(
   'test_mbsencode',