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 /src/journal/meson.build | |
parent | af8786b16a39fbc92818444aac156ccbb030018c (diff) | |
download | systemd-349cc4a507c4d84fcadf61f42159ea6412717896.tar.gz |
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 'src/journal/meson.build')
-rw-r--r-- | src/journal/meson.build | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/journal/meson.build b/src/journal/meson.build index b95efc2041..da42fd89d2 100644 --- a/src/journal/meson.build +++ b/src/journal/meson.build @@ -20,7 +20,7 @@ journal_internal_sources = files(''' sd-journal.c '''.split()) -if conf.get('HAVE_GCRYPT', false) +if conf.get('HAVE_GCRYPT') == 1 journal_internal_sources += files(''' journal-authenticate.c journal-authenticate.h @@ -36,7 +36,7 @@ endif audit_type_includes = [config_h, missing_h, 'linux/audit.h'] -if conf.get('HAVE_AUDIT', false) +if conf.get('HAVE_AUDIT') == 1 audit_type_includes += 'libaudit.h' endif @@ -97,7 +97,7 @@ systemd_cat_sources = files('cat.c') journalctl_sources = files('journalctl.c') -if conf.get('HAVE_QRENCODE', false) +if conf.get('HAVE_QRENCODE') == 1 journalctl_sources += files('journal-qrcode.c', 'journal-qrcode.h') endif |