]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
cryptsetup-fido2: Depend on libcryptsetup
authorWolfgang Müller <wolf@oriole.systems>
Mon, 24 Apr 2023 18:00:56 +0000 (20:00 +0200)
committerLuca Boccassi <luca.boccassi@gmail.com>
Tue, 25 Apr 2023 01:00:16 +0000 (02:00 +0100)
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.

src/shared/meson.build

index 060e528555e49f364b8f081b761c39f751efabfa..021ba517f8aba2bf7a0d272c5c6053c8cce9417f 100644 (file)
@@ -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