From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Wed, 12 Apr 2017 16:36:20 +0000 (-0400)
Subject: meson: disable bootctl without libblkid
X-Git-Tag: v234~286^2~53
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8191c5948baaaf666aebb5201adb317026d28912;p=thirdparty%2Fsystemd.git

meson: disable bootctl without libblkid

bootctl uses blkid probe functions to find the ESP, hence it's useless without
it. Don't even try to build it if libblkid is unavailable.
---

diff --git a/meson.build b/meson.build
index 116325fb7d7..7eac7b48fef 100644
--- a/meson.build
+++ b/meson.build
@@ -1306,7 +1306,7 @@ if conf.get('HAVE_PAM', 0) == 1
              install_dir : rootlibexecdir)
 endif
 
-if conf.get('ENABLE_EFI', 0) == 1
+if conf.get('ENABLE_EFI', 0) == 1 and conf.get('HAVE_BLKID', 0) == 1
   executable('bootctl',
              'src/boot/bootctl.c',
              include_directories : includes,
diff --git a/meson_options.txt b/meson_options.txt
index 5b3d37ce9e0..653a3a6ec73 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -36,7 +36,7 @@ option('ldconfig', type : 'boolean',
 option('resolve', type : 'boolean',
        description : 'systemd-resolved stack')
 option('efi', type : 'boolean',
-       description : 'support for EFI')
+       description : 'enable systemd-boot and bootctl')
 option('environment-d', type : 'boolean',
        description : 'support for environment.d')
 option('binfmt', type : 'boolean',