From: Wolfgang Müller <wolf@oriole.systems>
Date: Mon, 24 Apr 2023 18:00:56 +0000 (+0200)
Subject: cryptsetup-fido2: Depend on libcryptsetup
X-Git-Tag: v254-rc1~652
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=38fc5e0314c84b0259197f155e6cc8782e4773c7;p=thirdparty%2Fsystemd.git

cryptsetup-fido2: Depend on libcryptsetup

crypsetup-fido2 always depended on both libfido2 and libcryptsetup, but
0a8e026e825dda142a8f1552a4b45815cbfd0b48 forgot to make the then
implicit dependency on libcryptsetup explicit when moving it from
cryptsetup/ to shared/. This breaks builds when libfido2 is autodetected
but the system is missing libcryptsetup.

Introduce an explicit check for HAVE_LIBCRYPTSETUP such that
cryptsetup-fido2 is only built when both libraries are available.

Fixes #27374.
---

diff --git a/src/shared/meson.build b/src/shared/meson.build
index 060e528555e..021ba517f8a 100644
--- a/src/shared/meson.build
+++ b/src/shared/meson.build
@@ -226,7 +226,7 @@ if conf.get('ENABLE_NSCD') == 1
         shared_sources += files('nscd-flush.c')
 endif
 
-if conf.get('HAVE_LIBFIDO2') == 1
+if conf.get('HAVE_LIBFIDO2') == 1 and conf.get('HAVE_LIBCRYPTSETUP') == 1
         shared_sources += files('cryptsetup-fido2.c')
 endif