diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2017-10-03 10:41:51 +0200 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2017-10-04 12:09:29 +0200 |
| commit | 349cc4a507c4d84fcadf61f42159ea6412717896 (patch) | |
| tree | 8d6e64af681fb4e1e41a1fc01b4f225f56aa147d /sysusers.d/meson.build | |
| parent | meson: check for sys/auxv.h (diff) | |
| download | systemd-349cc4a507c4d84fcadf61f42159ea6412717896.tar.xz systemd-349cc4a507c4d84fcadf61f42159ea6412717896.zip | |
build-sys: use #if Y instead of #ifdef Y everywhere
The advantage is that is the name is mispellt, cpp will warn us.
$ git grep -Ee "conf.set\('(HAVE|ENABLE)_" -l|xargs sed -r -i "s/conf.set\('(HAVE|ENABLE)_/conf.set10('\1_/"
$ git grep -Ee '#ifn?def (HAVE|ENABLE)' -l|xargs sed -r -i 's/#ifdef (HAVE|ENABLE)/#if \1/; s/#ifndef (HAVE|ENABLE)/#if ! \1/;'
$ git grep -Ee 'if.*defined\(HAVE' -l|xargs sed -i -r 's/defined\((HAVE_[A-Z0-9_]*)\)/\1/g'
$ git grep -Ee 'if.*defined\(ENABLE' -l|xargs sed -i -r 's/defined\((ENABLE_[A-Z0-9_]*)\)/\1/g'
+ manual changes to meson.build
squash! build-sys: use #if Y instead of #ifdef Y everywhere
v2:
- fix incorrect setting of HAVE_LIBIDN2
Diffstat (limited to 'sysusers.d/meson.build')
| -rw-r--r-- | sysusers.d/meson.build | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sysusers.d/meson.build b/sysusers.d/meson.build index b7c02cf882..2f3f3ebd99 100644 --- a/sysusers.d/meson.build +++ b/sysusers.d/meson.build @@ -1,6 +1,6 @@ in_files = ['basic.conf'] -enable_sysusers = conf.get('ENABLE_SYSUSERS', false) +enable_sysusers = conf.get('ENABLE_SYSUSERS') == 1 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 |