meson: there is no smack library

Detection would always fail, so this was broken.
Treat this as a binary enable/disable option.

diff --git a/meson.build b/meson.build
index ae577660cd4df9a657c188c11e55fa17eb3a3516..59318a9a5db9152e39e8f274bdb181e0f6514567 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -642,18 +642,6 @@ else
         libapparmor = []
 endif
 
-want_smack = get_option('smack')
-if want_smack != 'false'
-        libsmack = dependency('libsmack',
-                              required : want_smack == 'true')
-        if libsmack.found()
-                conf.set('HAVE_SMACK', 1)
-                m4_defines += ['-DHAVE_SMACK']
-        endif
-else
-        libsmack = []
-endif
-
 smack_run_label = get_option('smack-run-label')
 if smack_run_label != ''
         conf.set_quoted('SMACK_RUN_LABEL', smack_run_label)
@@ -988,6 +976,7 @@ foreach pair : [['utmp',          'HAVE_UTMP'],
                 ['efi',           'ENABLE_EFI'],
                 ['tpm',           'SD_BOOT_LOG_TPM'],
                 ['ima',           'HAVE_IMA'],
+                ['smack',         'HAVE_SMACK'],
                ]
 
         if get_option(pair[0])

diff --git a/meson_options.txt b/meson_options.txt
index 350be3cc88cb763a9978f100ab467860e11c04db..6d40c3f806968b3fdc07d7aa6ceb6cf33c4cda91 100644 (file)
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -168,7 +168,7 @@ option('selinux', type : 'combo', choices : ['auto', 'true', 'false'],
        description : 'SELinux support')
 option('apparmor', type : 'combo', choices : ['auto', 'true', 'false'],
        description : 'AppArmor support')
-option('smack', type : 'combo', choices : ['auto', 'true', 'false'],
+option('smack', type : 'boolean',
        description : 'SMACK support')
 option('smack-run-label', type : 'string',
        description : 'run systemd --system itself with a specific SMACK label')