build-sys: s/HAVE_SMACK/ENABLE_SMACK/

[thirdparty/systemd.git] / meson.build

diff --git a/meson.build b/meson.build
index 2b1da8a41b0d8b21da3903e10a61cb1a1cc9f761..71e038f9d39e7103245cd3ea365f0faaac787a7c 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -242,7 +242,7 @@ if cxx.found()
 endif
 
 foreach arg : ['-Wextra',
-               '-Wundef',
+               '-Werror=undef',
                '-Wlogical-op',
                '-Wmissing-include-dirs',
                '-Wold-style-definition',
@@ -1036,7 +1036,7 @@ else
 endif
 conf.set10('ENABLE_REMOTE', have)
 
-foreach pair : [['utmp',          'HAVE_UTMP'],
+foreach pair : [['utmp',          'ENABLE_UTMP'],
                 ['hibernate',     'ENABLE_HIBERNATE'],
                 ['environment-d', 'ENABLE_ENVIRONMENT_D'],
                 ['binfmt',        'ENABLE_BINFMT'],
@@ -1062,8 +1062,8 @@ foreach pair : [['utmp',          'HAVE_UTMP'],
                 ['ldconfig',      'ENABLE_LDCONFIG'],
                 ['efi',           'ENABLE_EFI'],
                 ['tpm',           'ENABLE_TPM'],
-                ['ima',           'HAVE_IMA'],
-                ['smack',         'HAVE_SMACK'],
+                ['ima',           'ENABLE_IMA'],
+                ['smack',         'ENABLE_SMACK'],
                 ['gshadow',       'ENABLE_GSHADOW'],
                 ['idn',           'ENABLE_IDN'],
                 ['nss-systemd',   'ENABLE_NSS_SYSTEMD'],