From: Fred Morcos <fred.morcos@open-xchange.com>
Date: Tue, 29 Aug 2023 08:46:09 +0000 (+0200)
Subject: Meson: Improve detection of pkcs11 dependencies
X-Git-Tag: rec-5.1.0-alpha1~80^2~134
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1866208008fdb6c8ee68d08ea185904ea21842a4;p=thirdparty%2Fpdns.git

Meson: Improve detection of pkcs11 dependencies
---

diff --git a/meson/pkcs11/meson.build b/meson/pkcs11/meson.build
index 49015b9a43..8845ca83c1 100644
--- a/meson/pkcs11/meson.build
+++ b/meson/pkcs11/meson.build
@@ -1,12 +1,15 @@
-opt = get_option('experimental-pkcs11')
+opt_pkcs11 = get_option('experimental-pkcs11')
+dep_pkcs11 = dependency('', required: false)
+have_p11kit1 = false
+have_p11kit1_v2 = false
 
-dep_pkcs11 = dependency('p11-kit-1', required: opt)
-conf.set('HAVE_P11KIT1', dep_pkcs11.found(), description: 'Have p11-kit-1')
+if opt_pkcs11.enabled() or opt_pkcs11.auto()
+  dep_pkcs11 = dependency('p11-kit-1', required: opt_pkcs11)
+  have_p11kit1 = dep_pkcs11.found()
 
-prog = fs.read('p11_kit_module_for_name.cc')
-have = cxx.links(prog, dependencies: dep_pkcs11, name: 'we can link to p11kit1')
-conf.set('HAVE_P11KIT1_V2', have, description: 'Have p11-kit-1 0.20 or newer')
-
-if not have
-  warning('Could not find p11-kit-1')
+  prog = fs.read('p11_kit_module_for_name.cc')
+  have_p11kit1_v2 = cxx.links(prog, dependencies: dep_pkcs11, name: 'we can link to p11kit1')
 endif
+
+conf.set('HAVE_P11KIT1', have_p11kit1, description: 'Have p11-kit-1')
+conf.set('HAVE_P11KIT1_V2', have_p11kit1_v2, description: 'Have p11-kit-1 0.20 or newer')