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 --- src/import/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/import/meson.build') diff --git a/src/import/meson.build b/src/import/meson.build index 3fd58cc2c8..e3a0da65d2 100644 --- a/src/import/meson.build +++ b/src/import/meson.build @@ -48,7 +48,7 @@ systemd_export_sources = files(''' import-compress.h '''.split()) -if conf.get('ENABLE_IMPORTD', false) +if conf.get('ENABLE_IMPORTD') == 1 install_data('org.freedesktop.import1.conf', install_dir : dbuspolicydir) install_data('org.freedesktop.import1.service', -- cgit v1.2.3