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 /tmpfiles.d | |
| parent | meson: check for sys/auxv.h (diff) | |
| download | systemd-349cc4a507c4d84fcadf61f42159ea6412717896.tar.gz systemd-349cc4a507c4d84fcadf61f42159ea6412717896.tar.bz2 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 'tmpfiles.d')
| -rw-r--r-- | tmpfiles.d/meson.build | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tmpfiles.d/meson.build b/tmpfiles.d/meson.build index 7d21c6470..9a594a289 100644 --- a/tmpfiles.d/meson.build +++ b/tmpfiles.d/meson.build @@ -1,4 +1,4 @@ -enable_tmpfiles = conf.get('ENABLE_TMPFILES', false) +enable_tmpfiles = conf.get('ENABLE_TMPFILES') == 1 tmpfiles = [['home.conf', ''], ['journal-nocow.conf', ''], @@ -12,7 +12,7 @@ tmpfiles = [['home.conf', ''], foreach pair : tmpfiles if not enable_tmpfiles # do nothing - elif pair[1] == '' or conf.get(pair[1], false) + elif pair[1] == '' or conf.get(pair[1]) == 1 install_data(pair[0], install_dir : tmpfilesdir) else message('Not installing tmpfiles.d/@0@ because @1@ is @2@' @@ -28,7 +28,7 @@ m4_files = [['etc.conf', ''], foreach pair : m4_files if not enable_tmpfiles # do nothing - elif pair[1] == '' or conf.get(pair[1], false) + elif pair[1] == '' or conf.get(pair[1]) == 1 custom_target( 'tmpfiles.d_' + pair[0], input : pair[0] + '.m4', |