Merge pull request #17549 from yuwata/tiny-fixes

[thirdparty/systemd.git] / sysusers.d / meson.build

diff --git a/sysusers.d/meson.build b/sysusers.d/meson.build
index b7c02cf8828614e8f39f29902acde925ab24da56..93a61f0d9a892606e5f7b23f2dbd95e245d86db5 100644 (file)
--- a/sysusers.d/meson.build
+++ b/sysusers.d/meson.build
@@ -1,6 +1,6 @@
-in_files = ['basic.conf']
+# SPDX-License-Identifier: LGPL-2.1-or-later
 
-enable_sysusers = conf.get('ENABLE_SYSUSERS', false)
+in_files = ['basic.conf']
 
 foreach file : in_files
         gen = configure_file(
@@ -15,7 +15,7 @@ endforeach
 
 m4_files = ['systemd.conf']
 
-if conf.get('ENABLE_REMOTE', false) and conf.get('HAVE_MICROHTTPD', false)
+if conf.get('ENABLE_REMOTE') == 1 and conf.get('HAVE_MICROHTTPD') == 1
         m4_files += ['systemd-remote.conf']
 endif
 
@@ -24,7 +24,7 @@ foreach file : m4_files
                 'sysusers.d_' + file,
                 input : file + '.m4',
                 output: file,
-                command : [m4, '-P'] + m4_defines + ['@INPUT@'],
+                command : [meson_apply_m4, config_h, '@INPUT@'],
                 capture : true,
                 install : enable_sysusers,
                 install_dir : sysusersdir)