From 2c201c2140f9a75f3698e988880f00f8d0492315 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Thu, 27 Apr 2017 21:13:08 -0400 Subject: [PATCH] meson: use booleans for conf.set and drop unecessary conditionals Using conf.set() with a boolean argument does the right thing: either #ifdef or #undef. This means that conf.set can be used unconditionally. Previously I used '1' as the placeholder value, and that needs to be changed to 'true' for consistency (under meson 1 cannot be used in boolean context). All checks need to be adjusted. --- docs/sysvinit/meson.build | 2 +- docs/var-log/meson.build | 2 +- hwdb/meson.build | 2 +- man/meson.build | 2 +- meson.build | 218 +++++++++++++----------------- network/meson.build | 2 +- shell-completion/bash/meson.build | 2 +- shell-completion/zsh/meson.build | 2 +- src/boot/efi/meson.build | 2 +- src/coredump/meson.build | 2 +- src/hostname/meson.build | 2 +- src/import/meson.build | 2 +- src/journal-remote/meson.build | 4 +- src/journal/meson.build | 6 +- src/locale/meson.build | 4 +- src/login/meson.build | 4 +- src/machine/meson.build | 2 +- src/network/meson.build | 2 +- src/resolve/meson.build | 2 +- src/shared/meson.build | 8 +- src/timedate/meson.build | 2 +- src/timesync/meson.build | 2 +- src/udev/meson.build | 6 +- src/vconsole/meson.build | 2 +- sysctl.d/meson.build | 2 +- sysusers.d/meson.build | 4 +- test/meson.build | 2 +- tmpfiles.d/meson.build | 4 +- units/meson.build | 14 +- 29 files changed, 140 insertions(+), 170 deletions(-) diff --git a/docs/sysvinit/meson.build b/docs/sysvinit/meson.build index a8f5b519a3..79d1babf16 100644 --- a/docs/sysvinit/meson.build +++ b/docs/sysvinit/meson.build @@ -3,7 +3,7 @@ file = configure_file( output : 'README', configuration : substs) -if conf.get('HAVE_SYSV_COMPAT', 0) == 1 +if conf.get('HAVE_SYSV_COMPAT', false) install_data(file, install_dir : sysvinit_path) endif diff --git a/docs/var-log/meson.build b/docs/var-log/meson.build index c833f0f5b0..d8364e38b9 100644 --- a/docs/var-log/meson.build +++ b/docs/var-log/meson.build @@ -3,7 +3,7 @@ file = configure_file( output : 'README', configuration : substs) -if conf.get('HAVE_SYSV_COMPAT', 0) == 1 +if conf.get('HAVE_SYSV_COMPAT', false) install_data(file, install_dir : varlogdir) endif diff --git a/hwdb/meson.build b/hwdb/meson.build index 68a23e0afe..1f018111ed 100644 --- a/hwdb/meson.build +++ b/hwdb/meson.build @@ -17,7 +17,7 @@ hwdb_files = files(''' 70-touchpad.hwdb '''.split()) -if conf.get('ENABLE_HWDB', 0) == 1 +if conf.get('ENABLE_HWDB', false) install_data(hwdb_files, install_dir : udevhwdbdir) diff --git a/man/meson.build b/man/meson.build index 9cdb560c4c..6f7b1e8793 100644 --- a/man/meson.build +++ b/man/meson.build @@ -50,7 +50,7 @@ foreach tuple : manpages mandirn = join_paths(get_option('mandir'), 'man' + section) - if condition == '' or conf.get(condition, 0) == 1 + if condition == '' or conf.get(condition, false) p1 = custom_target( man, input : xml, diff --git a/meson.build b/meson.build index cb9713c0ae..14a20530d4 100644 --- a/meson.build +++ b/meson.build @@ -28,7 +28,7 @@ m4_defines = [] rootprefixdir = get_option('rootprefix') if get_option('split-usr') - conf.set('HAVE_SPLIT_USR', 1) + conf.set('HAVE_SPLIT_USR', true) rootprefixdir = rootprefixdir != '' ? rootprefixdir : '/' else rootprefixdir = rootprefixdir != '' ? rootprefixdir : '/usr' @@ -37,7 +37,7 @@ endif sysvinit_path = get_option('sysvinit-path') sysvrcnd_path = get_option('sysvrcnd-path') if sysvinit_path != '' or sysvrcnd_path != '' - conf.set('HAVE_SYSV_COMPAT', 1, + conf.set('HAVE_SYSV_COMPAT', true, description : 'SysV init scripts and rcN.d links are supported') m4_defines += ['-DHAVE_SYSV_COMPAT'] endif @@ -343,8 +343,8 @@ cpp = ' '.join(cc.cmd_array()) + ' -E' ##################################################################### # compilation result tests -conf.set('_GNU_SOURCE', 1) -conf.set('__SANE_USERSPACE_TYPES__', 1) +conf.set('_GNU_SOURCE', true) +conf.set('__SANE_USERSPACE_TYPES__', true) conf.set('SIZEOF_PID_T', cc.sizeof('pid_t', prefix : '#include ')) conf.set('SIZEOF_UID_T', cc.sizeof('uid_t', prefix : '#include ')) @@ -365,10 +365,10 @@ foreach decl : ['char16_t', 'key_serial_t', 'struct ethtool_link_settings', ] - if cc.sizeof(decl, prefix : decl_headers) > 0 - # We get -1 if the size cannot be determined - conf.set('HAVE_' + decl.underscorify().to_upper(), 1) - endif + + # We get -1 if the size cannot be determined + have = cc.sizeof(decl, prefix : decl_headers) > 0 + conf.set('HAVE_' + decl.underscorify().to_upper(), have) endforeach foreach decl : [['IFLA_INET6_ADDR_GEN_MODE', 'linux/if_link.h'], @@ -402,7 +402,7 @@ endforeach skip = false foreach ident : ['secure_getenv', '__secure_getenv'] if not skip and cc.has_function(ident) - conf.set('HAVE_' + ident.to_upper(), 1) + conf.set('HAVE_' + ident.to_upper(), true) skip = true endif endforeach @@ -431,8 +431,8 @@ foreach ident : [ endforeach if cc.has_function('getrandom', prefix : '''#include ''') - conf.set('USE_SYS_RANDOM_H', 1) - conf.set10('HAVE_DECL_GETRANDOM', 1) + conf.set('USE_SYS_RANDOM_H', true) + conf.set10('HAVE_DECL_GETRANDOM', true) else have = cc.has_function('getrandom', prefix : '''#include ''') conf.set10('HAVE_DECL_GETRANDOM', have) @@ -524,9 +524,9 @@ foreach header : ['linux/btrfs.h', 'valgrind/memcheck.h', 'valgrind/valgrind.h', ] - if cc.has_header(header) - conf.set('HAVE_' + header.underscorify().to_upper(), 1) - endif + + conf.set('HAVE_' + header.underscorify().to_upper(), + cc.has_header(header)) endforeach ############################################################ @@ -619,9 +619,9 @@ debug = get_option('debug') if debug != '' foreach name : debug.split(',') if name == 'hashmap' - conf.set('ENABLE_DEBUG_HASHMAP', 1) + conf.set('ENABLE_DEBUG_HASHMAP', true) elif name == 'mmap-cache' - conf.set('ENABLE_DEBUG_MMAP_CACHE', 1) + conf.set('ENABLE_DEBUG_MMAP_CACHE', true) else message('unknown debug option "@0@", ignoring'.format(name)) endif @@ -651,7 +651,7 @@ if want_seccomp != 'false' version : '>= 2.3.1', required : want_seccomp == 'true') if libseccomp.found() - conf.set('HAVE_SECCOMP', 1) + conf.set('HAVE_SECCOMP', true) m4_defines += ['-DHAVE_SECCOMP'] endif else @@ -664,7 +664,7 @@ if want_selinux != 'false' version : '>= 2.1.9', required : want_selinux == 'true') if libselinux.found() - conf.set('HAVE_SELINUX', 1) + conf.set('HAVE_SELINUX', true) m4_defines += ['-DHAVE_SELINUX'] endif else @@ -676,7 +676,7 @@ if want_apparmor != 'false' libapparmor = dependency('libapparmor', required : want_apparmor == 'true') if libapparmor.found() - conf.set('HAVE_APPARMOR', 1) + conf.set('HAVE_APPARMOR', true) m4_defines += ['-DHAVE_APPARMOR'] endif else @@ -693,7 +693,7 @@ want_polkit = get_option('polkit') install_polkit = false install_polkit_pkla = false if want_polkit != 'false' - conf.set('ENABLE_POLKIT', 1) + conf.set('ENABLE_POLKIT', true) install_polkit = true libpolkit = dependency('polkit-gobject-1', @@ -708,7 +708,7 @@ want_acl = get_option('acl') if want_acl != 'false' libacl = cc.find_library('acl', required : want_acl == 'true') if libacl.found() - conf.set('HAVE_ACL', 1) + conf.set('HAVE_ACL', true) m4_defines += ['-DHAVE_ACL'] endif else @@ -718,9 +718,7 @@ endif want_audit = get_option('audit') if want_audit != 'false' libaudit = dependency('audit', required : want_audit == 'true') - if libaudit.found() - conf.set('HAVE_AUDIT', 1) - endif + conf.set('HAVE_AUDIT', libaudit.found()) else libaudit = [] endif @@ -728,9 +726,7 @@ endif want_blkid = get_option('blkid') if want_blkid != 'false' libblkid = dependency('blkid', required : want_blkid == 'true') - if libblkid.found() - conf.set('HAVE_BLKID', 1) - endif + conf.set('HAVE_BLKID', libblkid.found()) else libblkid = [] endif @@ -740,9 +736,7 @@ if want_kmod != 'false' libkmod = dependency('libkmod', version : '>= 15', required : want_kmod == 'true') - if libkmod.found() - conf.set('HAVE_KMOD', 1) - endif + conf.set('HAVE_KMOD', libkmod.found()) else libkmod = [] endif @@ -752,7 +746,7 @@ if want_pam != 'false' libpam = cc.find_library('pam', required : want_pam == 'true') libpam_misc = cc.find_library('pam_misc', required : want_pam == 'true') if libpam.found() and libpam_misc.found() - conf.set('HAVE_PAM', 1) + conf.set('HAVE_PAM', true) m4_defines += ['-DHAVE_PAM'] endif else @@ -766,7 +760,7 @@ if want_microhttpd != 'false' version : '>= 0.9.33', required : want_microhttpd == 'true') if libmicrohttpd.found() - conf.set('HAVE_MICROHTTPD', 1) + conf.set('HAVE_MICROHTTPD', true) m4_defines += ['-DHAVE_MICROHTTPD'] endif else @@ -778,9 +772,7 @@ if want_libcryptsetup != 'false' libcryptsetup = dependency('libcryptsetup', version : '>= 1.6.0', required : want_libcryptsetup == 'true') - if libcryptsetup.found() - conf.set('HAVE_LIBCRYPTSETUP', 1) - endif + conf.set('HAVE_LIBCRYPTSETUP', libcryptsetup.found()) else libcryptsetup = [] endif @@ -791,7 +783,7 @@ if want_libcurl != 'false' version : '>= 7.32.0', required : want_libcurl == 'true') if libcurl.found() - conf.set('HAVE_LIBCURL', 1) + conf.set('HAVE_LIBCURL', true) m4_defines += ['-DHAVE_LIBCURL'] endif else @@ -803,7 +795,7 @@ if want_libidn != 'false' libidn = dependency('libidn', required : want_libidn == 'true') if libidn.found() - conf.set('HAVE_LIBIDN', 1) + conf.set('HAVE_LIBIDN', true) m4_defines += ['-DHAVE_LIBIDN'] endif else @@ -815,7 +807,7 @@ if want_libiptc != 'false' libiptc = dependency('libiptc', required : want_libiptc == 'true') if libiptc.found() - conf.set('HAVE_LIBIPTC', 1) + conf.set('HAVE_LIBIPTC', true) m4_defines += ['-DHAVE_LIBIPTC'] endif else @@ -826,9 +818,7 @@ want_qrencode = get_option('qrencode') if want_qrencode != 'false' libqrencode = dependency('libqrencode', required : want_qrencode == 'true') - if libqrencode.found() - conf.set('HAVE_QRENCODE', 1) - endif + conf.set('HAVE_QRENCODE', libqrencode.found()) else libqrencode = [] endif @@ -838,9 +828,7 @@ if want_gnutls != 'false' libgnutls = dependency('gnutls', version : '>= 3.1.4', required : want_gnutls == 'true') - if libgnutls.found() - conf.set('HAVE_GNUTLS', 1) - endif + conf.set('HAVE_GNUTLS', libgnutls.found()) else libgnutls = [] endif @@ -849,9 +837,7 @@ want_elfutils = get_option('elfutils') if want_elfutils != 'false' libdw = dependency('libdw', required : want_elfutils == 'true') - if libdw.found() - conf.set('HAVE_ELFUTILS', 1) - endif + conf.set('HAVE_ELFUTILS', libdw.found()) else libdw = [] endif @@ -860,9 +846,7 @@ want_zlib = get_option('zlib') if want_zlib != 'false' libz = dependency('zlib', required : want_zlib == 'true') - if libz.found() - conf.set('HAVE_ZLIB', 1) - endif + conf.set('HAVE_ZLIB', libz.found()) else libz = [] endif @@ -871,9 +855,7 @@ want_bzip2 = get_option('bzip2') if want_bzip2 != 'false' libbzip2 = cc.find_library('bz2', required : want_bzip2 == 'true') - if libbzip2.found() - conf.set('HAVE_BZIP2', 1) - endif + conf.set('HAVE_BZIP2', libbzip2.found()) else libbzip2 = [] endif @@ -882,9 +864,7 @@ want_xz = get_option('xz') if want_xz != 'false' libxz = dependency('liblzma', required : want_xz == 'true') - if libxz.found() - conf.set('HAVE_XZ', 1) - endif + conf.set('HAVE_XZ', libxz.found()) else libxz = [] endif @@ -893,9 +873,7 @@ want_lz4 = get_option('lz4') if want_lz4 != 'false' liblz4 = dependency('liblz4', required : want_lz4 == 'true') - if liblz4.found() - conf.set('HAVE_LZ4', 1) - endif + conf.set('HAVE_LZ4', liblz4.found()) else liblz4 = [] endif @@ -910,9 +888,8 @@ if want_glib != 'false' required : want_glib == 'true') libgio = dependency('gio-2.0', required : want_glib == 'true') - if libglib.found() and libgobject.found() and libgio.found() - conf.set('HAVE_GLIB', 1) - endif + have = libglib.found() and libgobject.found() and libgio.found() + conf.set('HAVE_GLIB', have) else libglib = [] libgobject = [] @@ -924,9 +901,7 @@ if want_xkbcommon != 'false' libxkbcommon = dependency('xkbcommon', version : '>= 0.3.0', required : want_xkbcommon == 'true') - if libxkbcommon.found() - conf.set('HAVE_XKBCOMMON', 1) - endif + conf.set('HAVE_XKBCOMMON', libxkbcommon.found()) else libxkbcommon = [] endif @@ -936,9 +911,7 @@ if want_dbus != 'false' libdbus = dependency('dbus-1', version : '>= 1.3.2', required : want_dbus == 'true') - if libdbus.found() - conf.set('HAVE_DBUS', 1) - endif + conf.set('HAVE_DBUS', libdbus.found()) else libdbus = [] endif @@ -948,9 +921,9 @@ if want_gcrypt != 'false' libgcrypt = cc.find_library('gcrypt', required : want_gcrypt == 'true') libgpg_error = cc.find_library('gpg-error', required : want_gcrypt == 'true') - if libgcrypt.found() and libgpg_error.found() - conf.set('HAVE_GCRYPT', 1) - else + have_deps = libgcrypt.found() and libgpg_error.found() + conf.set('HAVE_GCRYPT', have_deps) + if not have_deps # link to neither of the libs if one is not found libgcrypt = [] libgpg_error = [] @@ -962,22 +935,21 @@ endif want_importd = get_option('importd') if want_importd != 'false' - have_deps = (conf.get('HAVE_LIBCURL', 0) == 1 and - conf.get('HAVE_ZLIB', 0) == 1 and - conf.get('HAVE_BZIP2', 0) == 1 and - conf.get('HAVE_XZ', 0) == 1 and - conf.get('HAVE_GCRYPT', 0) == 1) - if have_deps - conf.set('ENABLE_IMPORTD', 1) - elif want_importd == 'true' + have_deps = (conf.get('HAVE_LIBCURL', false) and + conf.get('HAVE_ZLIB', false) and + conf.get('HAVE_BZIP2', false) and + conf.get('HAVE_XZ', false) and + conf.get('HAVE_GCRYPT', false)) + conf.set('ENABLE_IMPORTD', have_deps) + if want_importd == 'true' and not have_deps error('importd support was requested, but dependencies are not available') endif endif want_remote = get_option('remote') if want_remote != 'false' - have_deps = [conf.get('HAVE_MICROHTTPD', 0) == 1, - conf.get('HAVE_LIBCURL', 0) == 1] + have_deps = [conf.get('HAVE_MICROHTTPD', false), + conf.get('HAVE_LIBCURL', false)] # sd-j-remote requires µhttpd, and sd-j-upload requires libcurl, so # it's possible to build one without the other. Complain only if # support was explictly requested. The auxiliary files like sysusers @@ -985,9 +957,7 @@ if want_remote != 'false' if want_remote == 'true' and not (have_deps[0] and have_deps[1]) error('remote support was requested, but dependencies are not available') endif - if have_deps[0] or have_deps[1] - conf.set('ENABLE_REMOTE', 1) - endif + conf.set('ENABLE_REMOTE', have_deps[0] or have_deps[1]) endif foreach pair : [['utmp', 'HAVE_UTMP'], @@ -1021,7 +991,7 @@ foreach pair : [['utmp', 'HAVE_UTMP'], ] if get_option(pair[0]) - conf.set(pair[1], 1) + conf.set(pair[1], true) m4_defines += ['-D' + pair[1]] endif endforeach @@ -1052,7 +1022,7 @@ if get_option('efi') gnu_efi_arch = '' endif - conf.set('ENABLE_EFI', 1) + conf.set('ENABLE_EFI', true) conf.set_quoted('EFI_MACHINE_TYPE_NAME', EFI_MACHINE_TYPE_NAME) conf.set('SD_TPM_PCR', get_option('tpm-pcrindex').to_int()) @@ -1170,7 +1140,7 @@ foreach tuple : [['myhostname', 'HAVE_MYHOSTNAME', []], ['mymachines', 'ENABLE_MACHINED', []], ['resolve', 'ENABLE_RESOLVED', [libdl]]] - condition = tuple[1] == '' or conf.get(tuple[1], 0) == 1 + condition = tuple[1] == '' or conf.get(tuple[1], false) if condition module = tuple[0] extra_deps = tuple[2] @@ -1299,7 +1269,7 @@ executable('systemd-fstab-generator', install : true, install_dir : systemgeneratordir) -if conf.get('ENABLE_ENVIRONMENT_D', 0) == 1 +if conf.get('ENABLE_ENVIRONMENT_D', false) executable('30-systemd-environment-d-generator', 'src/environment-d-generator/environment-d-generator.c', include_directories : includes, @@ -1313,7 +1283,7 @@ if conf.get('ENABLE_ENVIRONMENT_D', 0) == 1 join_paths(environmentdir, '99-environment.conf')) endif -if conf.get('ENABLE_HIBERNATE', 0) == 1 +if conf.get('ENABLE_HIBERNATE', false) executable('systemd-hibernate-resume-generator', 'src/hibernate-resume/hibernate-resume-generator.c', include_directories : includes, @@ -1331,7 +1301,7 @@ if conf.get('ENABLE_HIBERNATE', 0) == 1 install_dir : rootlibexecdir) endif -if conf.get('HAVE_BLKID', 0) == 1 +if conf.get('HAVE_BLKID', false) executable('systemd-gpt-auto-generator', 'src/gpt-auto-generator/gpt-auto-generator.c', 'src/basic/blkid-util.h', @@ -1352,7 +1322,7 @@ if conf.get('HAVE_BLKID', 0) == 1 public_programs += [exe] endif -if conf.get('ENABLE_RESOLVED', 0) == 1 +if conf.get('ENABLE_RESOLVED', false) executable('systemd-resolved', systemd_resolved_sources, gcrypt_util_sources, @@ -1382,7 +1352,7 @@ if conf.get('ENABLE_RESOLVED', 0) == 1 public_programs += [exe] endif -if conf.get('ENABLE_LOGIND', 0) == 1 +if conf.get('ENABLE_LOGIND', false) executable('systemd-logind', systemd_logind_sources, include_directories : includes, @@ -1415,7 +1385,7 @@ if conf.get('ENABLE_LOGIND', 0) == 1 install_dir : rootbindir) public_programs += [exe] - if conf.get('HAVE_PAM', 0) == 1 + if conf.get('HAVE_PAM', false) version_script_arg = join_paths(meson.current_source_dir(), pam_systemd_sym) pam_systemd = shared_library( 'pam_systemd', @@ -1439,7 +1409,7 @@ if conf.get('ENABLE_LOGIND', 0) == 1 endif endif -if conf.get('HAVE_PAM', 0) == 1 +if conf.get('HAVE_PAM', false) executable('systemd-user-sessions', 'src/user-sessions/user-sessions.c', include_directories : includes, @@ -1449,7 +1419,7 @@ if conf.get('HAVE_PAM', 0) == 1 install_dir : rootlibexecdir) endif -if conf.get('ENABLE_EFI', 0) == 1 and conf.get('HAVE_BLKID', 0) == 1 +if conf.get('ENABLE_EFI', false) and conf.get('HAVE_BLKID', false) exe = executable('bootctl', 'src/boot/bootctl.c', include_directories : includes, @@ -1481,7 +1451,7 @@ exe = executable('systemctl', 'src/systemctl/systemctl.c', install_dir : rootbindir) public_programs += [exe] -if conf.get('ENABLE_BACKLIGHT', 0) == 1 +if conf.get('ENABLE_BACKLIGHT', false) executable('systemd-backlight', 'src/backlight/backlight.c', include_directories : includes, @@ -1491,7 +1461,7 @@ if conf.get('ENABLE_BACKLIGHT', 0) == 1 install_dir : rootlibexecdir) endif -if conf.get('ENABLE_RFKILL', 0) == 1 +if conf.get('ENABLE_RFKILL', false) executable('systemd-rfkill', 'src/rfkill/rfkill.c', include_directories : includes, @@ -1509,7 +1479,7 @@ executable('systemd-system-update-generator', install : true, install_dir : systemgeneratordir) -if conf.get('HAVE_LIBCRYPTSETUP', 0) == 1 +if conf.get('HAVE_LIBCRYPTSETUP', false) executable('systemd-cryptsetup', 'src/cryptsetup/cryptsetup.c', include_directories : includes, @@ -1547,7 +1517,7 @@ if conf.get('HAVE_LIBCRYPTSETUP', 0) == 1 install_dir : systemgeneratordir) endif -if conf.get('HAVE_SYSV_COMPAT', 0) == 1 +if conf.get('HAVE_SYSV_COMPAT', false) executable('systemd-sysv-generator', 'src/sysv-generator/sysv-generator.c', include_directories : includes, @@ -1565,7 +1535,7 @@ if conf.get('HAVE_SYSV_COMPAT', 0) == 1 install_dir : systemgeneratordir) endif -if conf.get('ENABLE_HOSTNAMED', 0) == 1 +if conf.get('ENABLE_HOSTNAMED', false) executable('systemd-hostnamed', 'src/hostname/hostnamed.c', include_directories : includes, @@ -1583,8 +1553,8 @@ if conf.get('ENABLE_HOSTNAMED', 0) == 1 public_programs += [exe] endif -if conf.get('ENABLE_LOCALED', 0) == 1 - if conf.get('HAVE_XKBCOMMON', 0) == 1 +if conf.get('ENABLE_LOCALED', false) + if conf.get('HAVE_XKBCOMMON', false) # logind will load libxkbcommon.so dynamically on its own deps = [libdl] else @@ -1609,7 +1579,7 @@ if conf.get('ENABLE_LOCALED', 0) == 1 public_programs += [exe] endif -if conf.get('ENABLE_TIMEDATED', 0) == 1 +if conf.get('ENABLE_TIMEDATED', false) executable('systemd-timedated', 'src/timedate/timedated.c', include_directories : includes, @@ -1627,7 +1597,7 @@ if conf.get('ENABLE_TIMEDATED', 0) == 1 public_programs += [exe] endif -if conf.get('ENABLE_TIMESYNCD', 0) == 1 +if conf.get('ENABLE_TIMESYNCD', false) executable('systemd-timesyncd', systemd_timesyncd_sources, include_directories : includes, @@ -1639,7 +1609,7 @@ if conf.get('ENABLE_TIMESYNCD', 0) == 1 install_dir : rootlibexecdir) endif -if conf.get('ENABLE_MACHINED', 0) == 1 +if conf.get('ENABLE_MACHINED', false) executable('systemd-machined', systemd_machined_sources, include_directories : includes, @@ -1662,7 +1632,7 @@ if conf.get('ENABLE_MACHINED', 0) == 1 public_programs += [exe] endif -if conf.get('ENABLE_IMPORTD', 0) == 1 +if conf.get('ENABLE_IMPORTD', false) executable('systemd-importd', systemd_importd_sources, include_directories : includes, @@ -1711,7 +1681,7 @@ if conf.get('ENABLE_IMPORTD', 0) == 1 public_programs += [systemd_pull, systemd_import, systemd_export] endif -if conf.get('ENABLE_REMOTE', 0) == 1 and conf.get('HAVE_LIBCURL', 0) == 1 +if conf.get('ENABLE_REMOTE', false) and conf.get('HAVE_LIBCURL', false) exe = executable('systemd-journal-upload', systemd_journal_upload_sources, include_directories : includes, @@ -1727,7 +1697,7 @@ if conf.get('ENABLE_REMOTE', 0) == 1 and conf.get('HAVE_LIBCURL', 0) == 1 public_programs += [exe] endif -if conf.get('ENABLE_REMOTE', 0) == 1 and conf.get('HAVE_MICROHTTPD', 0) == 1 +if conf.get('ENABLE_REMOTE', false) and conf.get('HAVE_MICROHTTPD', false) s_j_remote = executable('systemd-journal-remote', systemd_journal_remote_sources, include_directories : includes, @@ -1756,7 +1726,7 @@ if conf.get('ENABLE_REMOTE', 0) == 1 and conf.get('HAVE_MICROHTTPD', 0) == 1 public_programs += [s_j_remote, s_j_gatewayd] endif -if conf.get('ENABLE_COREDUMP', 0) == 1 +if conf.get('ENABLE_COREDUMP', false) executable('systemd-coredump', systemd_coredump_sources, include_directories : includes, @@ -1782,7 +1752,7 @@ if conf.get('ENABLE_COREDUMP', 0) == 1 public_programs += [exe] endif -if conf.get('ENABLE_BINFMT', 0) == 1 +if conf.get('ENABLE_BINFMT', false) exe = executable('systemd-binfmt', 'src/binfmt/binfmt.c', include_directories : includes, @@ -1798,7 +1768,7 @@ if conf.get('ENABLE_BINFMT', 0) == 1 mkdir_p.format(join_paths(sysconfdir, 'binfmt.d'))) endif -if conf.get('ENABLE_VCONSOLE', 0) == 1 +if conf.get('ENABLE_VCONSOLE', false) executable('systemd-vconsole-setup', 'src/vconsole/vconsole-setup.c', include_directories : includes, @@ -1808,7 +1778,7 @@ if conf.get('ENABLE_VCONSOLE', 0) == 1 install_dir : rootlibexecdir) endif -if conf.get('ENABLE_RANDOMSEED', 0) == 1 +if conf.get('ENABLE_RANDOMSEED', false) executable('systemd-random-seed', 'src/random-seed/random-seed.c', include_directories : includes, @@ -1818,7 +1788,7 @@ if conf.get('ENABLE_RANDOMSEED', 0) == 1 install_dir : rootlibexecdir) endif -if conf.get('ENABLE_FIRSTBOOT', 0) == 1 +if conf.get('ENABLE_FIRSTBOOT', false) executable('systemd-firstboot', 'src/firstboot/firstboot.c', include_directories : includes, @@ -2027,7 +1997,7 @@ exe = executable('busctl', install : true) public_programs += [exe] -if conf.get('ENABLE_SYSUSERS', 0) == 1 +if conf.get('ENABLE_SYSUSERS', false) exe = executable('systemd-sysusers', 'src/sysusers/sysusers.c', include_directories : includes, @@ -2038,7 +2008,7 @@ if conf.get('ENABLE_SYSUSERS', 0) == 1 public_programs += [exe] endif -if conf.get('ENABLE_TMPFILES', 0) == 1 +if conf.get('ENABLE_TMPFILES', false) exe = executable('systemd-tmpfiles', 'src/tmpfiles/tmpfiles.c', include_directories : includes, @@ -2050,7 +2020,7 @@ if conf.get('ENABLE_TMPFILES', 0) == 1 public_programs += [exe] endif -if conf.get('ENABLE_HWDB', 0) == 1 +if conf.get('ENABLE_HWDB', false) exe = executable('systemd-hwdb', 'src/hwdb/hwdb.c', 'src/libsystemd/sd-hwdb/hwdb-internal.h', @@ -2062,7 +2032,7 @@ if conf.get('ENABLE_HWDB', 0) == 1 public_programs += [exe] endif -if conf.get('ENABLE_QUOTACHECK', 0) == 1 +if conf.get('ENABLE_QUOTACHECK', false) executable('systemd-quotacheck', 'src/quotacheck/quotacheck.c', include_directories : includes, @@ -2139,7 +2109,7 @@ executable('systemd-update-utmp', install : true, install_dir : rootlibexecdir) -if conf.get('HAVE_KMOD', 0) == 1 +if conf.get('HAVE_KMOD', false) executable('systemd-modules-load', 'src/modules-load/modules-load.c', include_directories : includes, @@ -2171,7 +2141,7 @@ exe = executable('systemd-nspawn', install : true) public_programs += [exe] -if conf.get('ENABLE_NETWORKD', 0) == 1 +if conf.get('ENABLE_NETWORKD', false) executable('systemd-networkd', systemd_networkd_sources, include_directories : includes, @@ -2221,7 +2191,7 @@ foreach tuple : tests type = '' endif - if condition == '' or conf.get(condition, 0) == 1 + if condition == '' or conf.get(condition, false) install = install_tests and type == '' exe = executable( @@ -2422,7 +2392,7 @@ status += [ # CPPFLAGS: ${OUR_CPPFLAGS} ${CPPFLAGS} # LDFLAGS: ${OUR_LDFLAGS} ${LDFLAGS} -if conf.get('ENABLE_EFI', 0) == 1 +if conf.get('ENABLE_EFI', false) status += [ 'efi arch: @0@'.format(efi_arch)] @@ -2490,13 +2460,13 @@ foreach tuple : [ ['blkid'], ['dbus'], ['glib'], - ['nss-myhostname', conf.get('HAVE_MYHOSTNAME', 0) == 1], + ['nss-myhostname', conf.get('HAVE_MYHOSTNAME', false)], ['hwdb'], ['tpm'], ['man pages', want_man], ['html pages', want_html], ['man page indices', want_man and have_lxml], - ['split /usr', conf.get('HAVE_SPLIT_USR', 0) == 1], + ['split /usr', conf.get('HAVE_SPLIT_USR', false)], ['SysV compat'], ['utmp'], ['ldconfig'], @@ -2511,7 +2481,7 @@ foreach tuple : [ if cond == '' ident1 = 'HAVE_' + tuple[0].underscorify().to_upper() ident2 = 'ENABLE_' + tuple[0].underscorify().to_upper() - cond = conf.get(ident1, 0) == 1 or conf.get(ident2, 0) == 1 + cond = conf.get(ident1, false) or conf.get(ident2, false) endif if cond found += [tuple[0]] diff --git a/network/meson.build b/network/meson.build index f7d73f2db0..e9f9bbae42 100644 --- a/network/meson.build +++ b/network/meson.build @@ -1,4 +1,4 @@ -if conf.get('ENABLE_NETWORKD', 0) == 1 +if conf.get('ENABLE_NETWORKD', false) install_data('80-container-host0.network', '80-container-ve.network', '80-container-vz.network', diff --git a/shell-completion/bash/meson.build b/shell-completion/bash/meson.build index 8c2eada6cb..9399661845 100644 --- a/shell-completion/bash/meson.build +++ b/shell-completion/bash/meson.build @@ -42,7 +42,7 @@ if bashcompletiondir != 'no' ] foreach item : items - if item[1] == '' or conf.get(item[1], 0) == 1 + if item[1] == '' or conf.get(item[1], false) install_data(item[0], install_dir : bashcompletiondir) endif diff --git a/shell-completion/zsh/meson.build b/shell-completion/zsh/meson.build index ed1513ed25..34408ce90d 100644 --- a/shell-completion/zsh/meson.build +++ b/shell-completion/zsh/meson.build @@ -39,7 +39,7 @@ if zshcompletiondir != 'no' ] foreach item : items - if item[1] == '' or conf.get(item[1], 0) == 1 + if item[1] == '' or conf.get(item[1], false) install_data(item[0], install_dir : zshcompletiondir) endif diff --git a/src/boot/efi/meson.build b/src/boot/efi/meson.build index 6241cb1c19..6d1b38a527 100644 --- a/src/boot/efi/meson.build +++ b/src/boot/efi/meson.build @@ -28,7 +28,7 @@ stub_sources = ''' stub.c '''.split() -if conf.get('ENABLE_EFI', 0) == 1 and get_option('gnu-efi') != 'false' +if conf.get('ENABLE_EFI', false) and get_option('gnu-efi') != 'false' efi_cc = get_option('efi-cc') efi_ld = get_option('efi-ld') diff --git a/src/coredump/meson.build b/src/coredump/meson.build index ab3be6a7de..8f7d898b62 100644 --- a/src/coredump/meson.build +++ b/src/coredump/meson.build @@ -4,7 +4,7 @@ systemd_coredump_sources = files(''' coredump-vacuum.h '''.split()) -if conf.get('HAVE_ELFUTILS', 0) == 1 +if conf.get('HAVE_ELFUTILS', false) systemd_coredump_sources += files(['stacktrace.c', 'stacktrace.h']) endif diff --git a/src/hostname/meson.build b/src/hostname/meson.build index 7cb5fc135a..d58caa6787 100644 --- a/src/hostname/meson.build +++ b/src/hostname/meson.build @@ -1,4 +1,4 @@ -if conf.get('ENABLE_HOSTNAMED', 0) == 1 +if conf.get('ENABLE_HOSTNAMED', false) install_data('org.freedesktop.hostname1.conf', install_dir : dbuspolicydir) install_data('org.freedesktop.hostname1.service', diff --git a/src/import/meson.build b/src/import/meson.build index f0ed92b4c2..3fd58cc2c8 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', 0) == 1 +if conf.get('ENABLE_IMPORTD', false) install_data('org.freedesktop.import1.conf', install_dir : dbuspolicydir) install_data('org.freedesktop.import1.service', diff --git a/src/journal-remote/meson.build b/src/journal-remote/meson.build index 072fa14548..d266b34e65 100644 --- a/src/journal-remote/meson.build +++ b/src/journal-remote/meson.build @@ -21,7 +21,7 @@ systemd_journal_gatewayd_sources = files(''' microhttpd-util.c '''.split()) -if conf.get('ENABLE_REMOTE', 0) == 1 and conf.get('HAVE_LIBCURL', 0) == 1 +if conf.get('ENABLE_REMOTE', false) and conf.get('HAVE_LIBCURL', false) journal_upload_conf = configure_file( input : 'journal-upload.conf.in', output : 'journal-upload.conf', @@ -30,7 +30,7 @@ if conf.get('ENABLE_REMOTE', 0) == 1 and conf.get('HAVE_LIBCURL', 0) == 1 install_dir : pkgsysconfdir) endif -if conf.get('ENABLE_REMOTE', 0) == 1 and conf.get('HAVE_MICROHTTPD', 0) == 1 +if conf.get('ENABLE_REMOTE', false) and conf.get('HAVE_MICROHTTPD', false) journal_remote_conf = configure_file( input : 'journal-remote.conf.in', output : 'journal-remote.conf', diff --git a/src/journal/meson.build b/src/journal/meson.build index 37ec559e41..582f83afb9 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', 0) == 1 +if conf.get('HAVE_GCRYPT', false) 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', 0) == 1 +if conf.get('HAVE_AUDIT', false) audit_type_includes += 'libaudit.h' endif @@ -95,7 +95,7 @@ systemd_cat_sources = files('cat.c') journalctl_sources = files('journalctl.c') -if conf.get('HAVE_QRENCODE', 0) == 1 +if conf.get('HAVE_QRENCODE', false) journalctl_sources += files('journal-qrcode.c', 'journal-qrcode.h') endif diff --git a/src/locale/meson.build b/src/locale/meson.build index d03af4c0e2..d7dd113c8d 100644 --- a/src/locale/meson.build +++ b/src/locale/meson.build @@ -6,7 +6,7 @@ systemd_localed_sources = files(''' localectl_sources = files('localectl.c') -if conf.get('ENABLE_LOCALED', 0) == 1 +if conf.get('ENABLE_LOCALED', false) install_data('org.freedesktop.locale1.conf', install_dir : dbuspolicydir) install_data('org.freedesktop.locale1.service', @@ -27,7 +27,7 @@ endif kbd_model_map = join_paths(meson.current_source_dir(), 'kbd-model-map') language_fallback_map = join_paths(meson.current_source_dir(), 'language-fallback-map') -if conf.get('ENABLE_LOCALED', 0) == 1 +if conf.get('ENABLE_LOCALED', false) install_data('kbd-model-map', 'language-fallback-map', install_dir : pkgdatadir) diff --git a/src/login/meson.build b/src/login/meson.build index a518215be8..26bdbec424 100644 --- a/src/login/meson.build +++ b/src/login/meson.build @@ -39,7 +39,7 @@ liblogind_core_sources = files(''' '''.split()) logind_acl_c = files('logind-acl.c') -if conf.get('HAVE_ACL', 0) == 1 +if conf.get('HAVE_ACL', false) liblogind_core_sources += logind_acl_c endif @@ -55,7 +55,7 @@ loginctl_sources = files(''' sysfs-show.c '''.split()) -if conf.get('ENABLE_LOGIND', 0) == 1 +if conf.get('ENABLE_LOGIND', false) logind_conf = configure_file( input : 'logind.conf.in', output : 'logind.conf', diff --git a/src/machine/meson.build b/src/machine/meson.build index 953774fdb6..1a0813323c 100644 --- a/src/machine/meson.build +++ b/src/machine/meson.build @@ -21,7 +21,7 @@ libmachine_core = static_library( include_directories : includes, dependencies : [threads]) -if conf.get('ENABLE_MACHINED', 0) == 1 +if conf.get('ENABLE_MACHINED', false) install_data('org.freedesktop.machine1.conf', install_dir : dbuspolicydir) install_data('org.freedesktop.machine1.service', diff --git a/src/network/meson.build b/src/network/meson.build index 771aa68ec1..ebd4e62eb3 100644 --- a/src/network/meson.build +++ b/src/network/meson.build @@ -75,7 +75,7 @@ networkctl_sources = files('networkctl.c') network_include_dir = include_directories('.') -if conf.get('ENABLE_NETWORKD', 0) == 1 +if conf.get('ENABLE_NETWORKD', false) networkd_gperf_c = custom_target( 'networkd-gperf.c', input : 'networkd-gperf.gperf', diff --git a/src/resolve/meson.build b/src/resolve/meson.build index 347ffaaeca..f3c411ffee 100644 --- a/src/resolve/meson.build +++ b/src/resolve/meson.build @@ -123,7 +123,7 @@ systemd_resolve_sources = (basic_dns_sources + systemd_resolve_only_sources + dns_type_headers) -if conf.get('ENABLE_RESOLVED', 0) == 1 +if conf.get('ENABLE_RESOLVED', false) install_data('org.freedesktop.resolve1.conf', install_dir : dbuspolicydir) install_data('org.freedesktop.resolve1.service', diff --git a/src/shared/meson.build b/src/shared/meson.build index 0747f76649..49a7d9f30b 100644 --- a/src/shared/meson.build +++ b/src/shared/meson.build @@ -103,19 +103,19 @@ shared_sources = ''' test_tables_h = files('test-tables.h') shared_sources += [test_tables_h] -if conf.get('HAVE_ACL', 0) == 1 +if conf.get('HAVE_ACL', false) shared_sources += ['acl-util.c'] endif -if conf.get('HAVE_UTMP', 0) == 1 +if conf.get('HAVE_UTMP', false) shared_sources += ['utmp-wtmp.c'] endif -if conf.get('HAVE_SECCOMP', 0) == 1 +if conf.get('HAVE_SECCOMP', false) shared_sources += ['seccomp-util.c'] endif -if conf.get('HAVE_LIBIPTC', 0) == 1 +if conf.get('HAVE_LIBIPTC', false) shared_sources += ['firewall-util.c'] endif diff --git a/src/timedate/meson.build b/src/timedate/meson.build index 2e74245f66..63124d665b 100644 --- a/src/timedate/meson.build +++ b/src/timedate/meson.build @@ -1,4 +1,4 @@ -if conf.get('ENABLE_TIMEDATED', 0) == 1 +if conf.get('ENABLE_TIMEDATED', false) install_data('org.freedesktop.timedate1.conf', install_dir : dbuspolicydir) install_data('org.freedesktop.timedate1.service', diff --git a/src/timesync/meson.build b/src/timesync/meson.build index dece39ea10..ee54c3e449 100644 --- a/src/timesync/meson.build +++ b/src/timesync/meson.build @@ -16,7 +16,7 @@ timesyncd_gperf_c = custom_target( systemd_timesyncd_sources += [timesyncd_gperf_c] -if conf.get('ENABLE_TIMESYNCD', 0) == 1 +if conf.get('ENABLE_TIMESYNCD', false) timesyncd_conf = configure_file( input : 'timesyncd.conf.in', output : 'timesyncd.conf', diff --git a/src/udev/meson.build b/src/udev/meson.build index 495e9d3c54..9692ddc1e9 100644 --- a/src/udev/meson.build +++ b/src/udev/meson.build @@ -36,15 +36,15 @@ libudev_core_sources = ''' net/ethtool-util.h '''.split() -if conf.get('HAVE_KMOD', 0) == 1 +if conf.get('HAVE_KMOD', false) libudev_core_sources += ['udev-builtin-kmod.c'] endif -if conf.get('HAVE_BLKID', 0) == 1 +if conf.get('HAVE_BLKID', false) libudev_core_sources += ['udev-builtin-blkid.c'] endif -if conf.get('HAVE_ACL', 0) == 1 +if conf.get('HAVE_ACL', false) libudev_core_sources += ['udev-builtin-uaccess.c', logind_acl_c, sd_login_c] diff --git a/src/vconsole/meson.build b/src/vconsole/meson.build index ac382e3daa..1260b53537 100644 --- a/src/vconsole/meson.build +++ b/src/vconsole/meson.build @@ -1,4 +1,4 @@ -if conf.get('ENABLE_VCONSOLE', 0) == 1 +if conf.get('ENABLE_VCONSOLE', false) vconsole_rules = configure_file( input : '90-vconsole.rules.in', output : '90-vconsole.rules', diff --git a/sysctl.d/meson.build b/sysctl.d/meson.build index 1205c3a122..1b6707df77 100644 --- a/sysctl.d/meson.build +++ b/sysctl.d/meson.build @@ -4,7 +4,7 @@ install_data( in_files = [] -if conf.get('ENABLE_COREDUMP', 0) == 1 +if conf.get('ENABLE_COREDUMP', false) in_files += ['50-coredump.conf'] endif diff --git a/sysusers.d/meson.build b/sysusers.d/meson.build index 8e126f289a..f4662c0a85 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', 0) == 1 +enable_sysusers = conf.get('ENABLE_SYSUSERS', false) foreach file : in_files gen = configure_file( @@ -15,7 +15,7 @@ endforeach m4_files = ['systemd.conf'] -if conf.get('ENABLE_REMOTE', 0) == 1 and conf.get('HAVE_MICROHTTPD', 0) == 1 +if conf.get('ENABLE_REMOTE', false) and conf.get('HAVE_MICROHTTPD', false) m4_files += ['systemd-remote.conf'] endif diff --git a/test/meson.build b/test/meson.build index 5823976d10..b7fb507c9c 100644 --- a/test/meson.build +++ b/test/meson.build @@ -137,7 +137,7 @@ test_data_files = ''' journal-data/journal-2.txt '''.split() -if conf.get('ENABLE_RESOLVED', 0) == 1 +if conf.get('ENABLE_RESOLVED', false) test_data_files += ''' test-resolve/_openpgpkey.fedoraproject.org.pkts test-resolve/fedoraproject.org.pkts diff --git a/tmpfiles.d/meson.build b/tmpfiles.d/meson.build index dfbe04a976..d68d17e956 100644 --- a/tmpfiles.d/meson.build +++ b/tmpfiles.d/meson.build @@ -1,4 +1,4 @@ -enable_tmpfiles = conf.get('ENABLE_TMPFILES', 0) == 1 +enable_tmpfiles = conf.get('ENABLE_TMPFILES', false) tmpfiles = [['home.conf', ''], ['journal-nocow.conf', ''], @@ -14,7 +14,7 @@ tmpfiles = [['home.conf', ''], foreach pair : tmpfiles if not enable_tmpfiles # do nothing - elif pair[1] == '' or conf.get(pair[1], 0) == 1 + elif pair[1] == '' or conf.get(pair[1], false) install_data(pair[0], install_dir : tmpfilesdir) else message('Not installing tmpfiles.d/@0@ because @1@ is @2@' diff --git a/units/meson.build b/units/meson.build index 9411891c7f..6fb1fa29c9 100644 --- a/units/meson.build +++ b/units/meson.build @@ -240,8 +240,8 @@ foreach tuple : in_units # we do this here because install_data does not accept custom_target output conds = tuple[1].split(' ') - install = ((conds.get(0, '') == '' or conf.get(conds[0], 0) == 1) and - (conds.get(1, '') == '' or conf.get(conds[1], 0) == 1)) + install = ((conds.get(0, '') == '' or conf.get(conds[0], false)) and + (conds.get(1, '') == '' or conf.get(conds[1], false))) gen1 = configure_file( input : file + '.in', @@ -269,8 +269,8 @@ foreach tuple : m4_units # we do this here because install_data does not accept custom_target output conds = tuple[1].split(' ') - install = ((conds.get(0, '') == '' or conf.get(conds[0], 0) == 1) and - (conds.get(1, '') == '' or conf.get(conds[1], 0) == 1)) + install = ((conds.get(0, '') == '' or conf.get(conds[0], false)) and + (conds.get(1, '') == '' or conf.get(conds[1], false))) custom_target( file, @@ -293,8 +293,8 @@ foreach tuple : units input = tuple.get(3, file) conds = tuple[1].split(' ') - install = ((conds.get(0, '') == '' or conf.get(conds[0], 0) == 1) and - (conds.get(1, '') == '' or conf.get(conds[1], 0) == 1)) + install = ((conds.get(0, '') == '' or conf.get(conds[0], false)) and + (conds.get(1, '') == '' or conf.get(conds[1], false))) if install install_data(input, @@ -317,7 +317,7 @@ meson.add_install_script(meson_make_symlink, meson.add_install_script(meson_make_symlink, join_paths(dbussystemservicedir, 'org.freedesktop.systemd1.service'), join_paths(dbussessionservicedir, 'org.freedesktop.systemd1.service')) -if conf.get('HAVE_SYSV_COMPAT', 0) == 1 +if conf.get('HAVE_SYSV_COMPAT', false) foreach i : [1, 2, 3, 4, 5] meson.add_install_script( 'sh', '-c',