From 349cc4a507c4d84fcadf61f42159ea6412717896 Mon Sep 17 00:00:00 2001 From: Zbigniew Jędrzejewski-Szmek Date: Tue, 3 Oct 2017 10:41:51 +0200 Subject: 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 --- sysusers.d/meson.build | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'sysusers.d') 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 -- cgit v1.2.3