From: Sven Eden <yamakuzure@gmx.net>
Date: Fri, 1 Jun 2018 18:21:05 +0000 (+0200)
Subject: Prep v238: Updated root build files (2/5)
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=b7391745709132996173cc80b83a5ce8d6c4047f;p=elogind.git

Prep v238: Updated root build files (2/5)
---

diff --git a/cb/elogind.cbp b/cb/elogind.cbp
index 60a38f649..e65d96c8e 100644
--- a/cb/elogind.cbp
+++ b/cb/elogind.cbp
@@ -686,6 +686,7 @@
 			<Option target="all" />
 			<Option target="clean" />
 		</Unit>
+		<Unit filename="../src/core/meson.build" />
 		<Unit filename="../src/core/mount-setup.c">
 			<Option compilerVar="CC" />
 			<Option target="all" />
@@ -703,15 +704,6 @@
 			<Option target="all" />
 			<Option target="clean" />
 		</Unit>
-		<Unit filename="../src/libelogind/sd-bus/bus-bloom.c">
-			<Option compilerVar="CC" />
-			<Option target="all" />
-			<Option target="clean" />
-		</Unit>
-		<Unit filename="../src/libelogind/sd-bus/bus-bloom.h">
-			<Option target="all" />
-			<Option target="clean" />
-		</Unit>
 		<Unit filename="../src/libelogind/sd-bus/bus-common-errors.c">
 			<Option compilerVar="CC" />
 			<Option target="all" />
diff --git a/meson.build b/meson.build
index d1f59fbde..be561ba94 100644
--- a/meson.build
+++ b/meson.build
@@ -54,7 +54,7 @@ m4_defines = []
 
 #####################################################################
 #if 0 /// elogind does not need this
-# 
+#
 # # Try to install the git pre-commit hook
 # git_hook = run_command(join_paths(meson.source_root(), 'tools/add-git-hook.sh'))
 # if git_hook.returncode() == 0
@@ -181,7 +181,7 @@ modprobedir = join_paths(rootprefixdir, 'lib/modprobe.d')
 # systemdstatedir = join_paths(localstatedir, 'lib/systemd')
 # catalogstatedir = join_paths(systemdstatedir, 'catalog')
 # randomseeddir = join_paths(localstatedir, 'lib/systemd')
-# 
+#
 # docdir = get_option('docdir')
 # if docdir == ''
 #         docdir = join_paths(datadir, 'doc/systemd')
@@ -232,7 +232,9 @@ if pamconfdir == ''
         pamconfdir = join_paths(sysconfdir, 'pam.d')
 endif
 
-memory_accounting_default = get_option('memory-accounting-default')
+#if 0 /// UNNEEDED by elogind
+# memory_accounting_default = get_option('memory-accounting-default')
+#endif // 0
 
 conf.set_quoted('PKGSYSCONFDIR',                              pkgsysconfdir)
 conf.set_quoted('SYSTEM_CONFIG_UNIT_PATH',                    join_paths(pkgsysconfdir, 'system'))
@@ -242,9 +244,9 @@ conf.set_quoted('SYSTEM_CONFIG_UNIT_PATH',                    join_paths(pkgsysc
 # conf.set_quoted('SYSTEM_SYSVRCND_PATH',                       sysvrcnd_path)
 # conf.set_quoted('RC_LOCAL_SCRIPT_PATH_START',                 get_option('rc-local'))
 # conf.set_quoted('RC_LOCAL_SCRIPT_PATH_STOP',                  get_option('halt-local'))
-# 
+#
 # conf.set('ANSI_OK_COLOR',                                     'ANSI_' + get_option('ok-color').underscorify().to_upper())
-# 
+#
 # conf.set_quoted('USER_CONFIG_UNIT_PATH',                      join_paths(pkgsysconfdir, 'user'))
 # conf.set_quoted('USER_DATA_UNIT_PATH',                        userunitdir)
 # conf.set_quoted('CERTIFICATE_ROOT',                           get_option('certificate-root'))
@@ -293,9 +295,9 @@ conf.set_quoted('ROOTLIBEXECDIR',                             rootlibexecdir)
 # conf.set_quoted('VENDOR_KEYRING_PATH',                        join_paths(rootlibexecdir, 'import-pubring.gpg'))
 # conf.set_quoted('USER_KEYRING_PATH',                          join_paths(pkgsysconfdir, 'import-pubring.gpg'))
 # conf.set_quoted('DOCUMENT_ROOT',                              join_paths(pkgdatadir, 'gatewayd'))
+# conf.set('MEMORY_ACCOUNTING_DEFAULT',                         memory_accounting_default ? 'true' : 'false')
+# conf.set_quoted('MEMORY_ACCOUNTING_DEFAULT_ON_OFF',           memory_accounting_default ? 'on' : 'off')
 #endif // 0
-conf.set('MEMORY_ACCOUNTING_DEFAULT',                         memory_accounting_default ? 'true' : 'false')
-conf.set_quoted('MEMORY_ACCOUNTING_DEFAULT_ON_OFF',           memory_accounting_default ? 'on' : 'off')
 
 conf.set_quoted('ABS_BUILD_DIR',                              meson.build_root())
 conf.set_quoted('ABS_SRC_DIR',                                meson.source_root())
@@ -341,8 +343,8 @@ substs.set('VARLOGDIR',                                       varlogdir)
 # substs.set('SYSTEM_SYSVRCND_PATH',                            sysvrcnd_path)
 # substs.set('RC_LOCAL_SCRIPT_PATH_START',                      get_option('rc-local'))
 # substs.set('RC_LOCAL_SCRIPT_PATH_STOP',                       get_option('halt-local'))
+# substs.set('MEMORY_ACCOUNTING_DEFAULT',                       memory_accounting_default ? 'yes' : 'no')
 #endif // 0
-substs.set('MEMORY_ACCOUNTING_DEFAULT',                       memory_accounting_default ? 'yes' : 'no')
 
 #####################################################################
 
@@ -359,18 +361,22 @@ if get_option('tests') != 'false'
         endif
 endif
 
-want_ossfuzz = get_option('oss-fuzz')
-want_libfuzzer = get_option('llvm-fuzz')
-fuzzer_build = want_ossfuzz or want_libfuzzer
-if want_ossfuzz and want_libfuzzer
-        error('only one of oss-fuzz and llvm-fuzz can be specified')
-endif
-if want_libfuzzer
-        fuzzing_engine = meson.get_compiler('cpp').find_library('Fuzzer')
-endif
-if want_ossfuzz
-        fuzzing_engine = meson.get_compiler('cpp').find_library('FuzzingEngine')
-endif
+#if 0 /// elogind does not support fuzz stress testing (, yet).
+# want_ossfuzz = get_option('oss-fuzz')
+# want_libfuzzer = get_option('llvm-fuzz')
+# fuzzer_build = want_ossfuzz or want_libfuzzer
+# if want_ossfuzz and want_libfuzzer
+#         error('only one of oss-fuzz and llvm-fuzz can be specified')
+# endif
+# if want_libfuzzer
+#         fuzzing_engine = meson.get_compiler('cpp').find_library('Fuzzer')
+# endif
+# if want_ossfuzz
+#         fuzzing_engine = meson.get_compiler('cpp').find_library('FuzzingEngine')
+# endif
+#else
+fuzzer_build = false
+#endif // 0
 
 foreach arg : ['-Wextra',
                '-Werror=undef',
@@ -677,7 +683,9 @@ foreach prog : progs
         substs.set(name, path)
 endforeach
 
-conf.set_quoted('TELINIT', get_option('telinit-path'))
+#if 0 /// unneeded by elogind
+# conf.set_quoted('TELINIT', get_option('telinit-path'))
+#endif // 0
 
 if run_command('ln', '--relative', '--help').returncode() != 0
         error('ln does not support --relative')
@@ -816,7 +824,7 @@ message('maximum system GID is @0@'.format(system_gid_max))
 # conf.set('DYNAMIC_UID_MAX', dynamic_uid_max)
 # substs.set('dynamicuidmin', dynamic_uid_min)
 # substs.set('dynamicuidmax', dynamic_uid_max)
-# 
+#
 # container_uid_base_min = get_option('container-uid-base-min').to_int()
 # container_uid_base_max = get_option('container-uid-base-max').to_int()
 # conf.set('CONTAINER_UID_BASE_MIN', container_uid_base_min)
@@ -888,15 +896,15 @@ substs.set('TTY_GID', tty_gid)
 #         users_gid = '-'
 # endif
 # substs.set('USERS_GID', users_gid)
-# 
+#
 # if get_option('adm-group')
 #         m4_defines += ['-DENABLE_ADM_GROUP']
 # endif
-# 
+#
 # if get_option('wheel-group')
 #         m4_defines += ['-DENABLE_WHEEL_GROUP']
 # endif
-# 
+#
 # substs.set('DEV_KVM_MODE', get_option('dev-kvm-mode'))
 # substs.set('GROUP_RENDER_MODE', get_option('group-render-mode'))
 #endif // 0
@@ -909,7 +917,7 @@ substs.set('KILL_USER_PROCESSES', kill_user_processes ? 'yes' : 'no')
 # dns_servers = get_option('dns-servers')
 # conf.set_quoted('DNS_SERVERS', dns_servers)
 # substs.set('DNS_SERVERS', dns_servers)
-# 
+#
 # ntp_servers = get_option('ntp-servers')
 # conf.set_quoted('NTP_SERVERS', ntp_servers)
 # substs.set('NTP_SERVERS', ntp_servers)
@@ -967,7 +975,7 @@ endif
 # libmount = dependency('mount',
 #                       version : '>= 2.30',
 #                       required : not fuzzer_build)
-# 
+#
 # want_seccomp = get_option('seccomp')
 # if want_seccomp != 'false' and not fuzzer_build
 #         libseccomp = dependency('libseccomp',
@@ -1065,7 +1073,7 @@ conf.set10('HAVE_AUDIT', have)
 #         libblkid = []
 # endif
 # conf.set10('HAVE_BLKID', have)
-# 
+#
 # want_kmod = get_option('kmod')
 # if want_kmod != 'false' and not fuzzer_build
 #         libkmod = dependency('libkmod',
@@ -1108,7 +1116,7 @@ m4_defines += have ? ['-DHAVE_PAM'] : []
 # endif
 # conf.set10('HAVE_MICROHTTPD', have)
 # m4_defines += have ? ['-DHAVE_MICROHTTPD'] : []
-# 
+#
 # want_libcryptsetup = get_option('libcryptsetup')
 # if want_libcryptsetup != 'false' and not fuzzer_build
 #         libcryptsetup = dependency('libcryptsetup',
@@ -1120,7 +1128,7 @@ m4_defines += have ? ['-DHAVE_PAM'] : []
 #         libcryptsetup = []
 # endif
 # conf.set10('HAVE_LIBCRYPTSETUP', have)
-# 
+#
 # want_libcurl = get_option('libcurl')
 # if want_libcurl != 'false' and not fuzzer_build
 #         libcurl = dependency('libcurl',
@@ -1133,13 +1141,13 @@ m4_defines += have ? ['-DHAVE_PAM'] : []
 # endif
 # conf.set10('HAVE_LIBCURL', have)
 # m4_defines += have ? ['-DHAVE_LIBCURL'] : []
-# 
+#
 # want_libidn = get_option('libidn')
 # want_libidn2 = get_option('libidn2')
 # if want_libidn == 'true' and want_libidn2 == 'true'
 #         error('libidn and libidn2 cannot be requested simultaneously')
 # endif
-# 
+#
 # if want_libidn != 'false' and want_libidn2 != 'true' and not fuzzer_build
 #         libidn = dependency('libidn',
 #                             required : want_libidn == 'true')
@@ -1160,7 +1168,7 @@ m4_defines += have ? ['-DHAVE_PAM'] : []
 # endif
 # conf.set10('HAVE_LIBIDN2', have)
 # m4_defines += have ? ['-DHAVE_LIBIDN2'] : []
-# 
+#
 # want_libiptc = get_option('libiptc')
 # if want_libiptc != 'false' and not fuzzer_build
 #         libiptc = dependency('libiptc',
@@ -1172,7 +1180,7 @@ m4_defines += have ? ['-DHAVE_PAM'] : []
 # endif
 # conf.set10('HAVE_LIBIPTC', have)
 # m4_defines += have ? ['-DHAVE_LIBIPTC'] : []
-# 
+#
 # want_qrencode = get_option('qrencode')
 # if want_qrencode != 'false' and not fuzzer_build
 #         libqrencode = dependency('libqrencode',
@@ -1183,7 +1191,7 @@ m4_defines += have ? ['-DHAVE_PAM'] : []
 #         libqrencode = []
 # endif
 # conf.set10('HAVE_QRENCODE', have)
-# 
+#
 # want_gcrypt = get_option('gcrypt')
 # if want_gcrypt != 'false' and not fuzzer_build
 #         libgcrypt = cc.find_library('gcrypt', required : want_gcrypt == 'true')
@@ -1198,7 +1206,7 @@ m4_defines += have ? ['-DHAVE_PAM'] : []
 #         libgpg_error = []
 # endif
 # conf.set10('HAVE_GCRYPT', have)
-# 
+#
 # want_gnutls = get_option('gnutls')
 # if want_gnutls != 'false' and not fuzzer_build
 #         libgnutls = dependency('gnutls',
@@ -1210,7 +1218,7 @@ m4_defines += have ? ['-DHAVE_PAM'] : []
 #         libgnutls = []
 # endif
 # conf.set10('HAVE_GNUTLS', have)
-# 
+#
 # want_elfutils = get_option('elfutils')
 # if want_elfutils != 'false' and not fuzzer_build
 #         libdw = dependency('libdw',
@@ -1221,7 +1229,7 @@ m4_defines += have ? ['-DHAVE_PAM'] : []
 #         libdw = []
 # endif
 # conf.set10('HAVE_ELFUTILS', have)
-# 
+#
 # want_zlib = get_option('zlib')
 # if want_zlib != 'false' and not fuzzer_build
 #         libz = dependency('zlib',
@@ -1232,7 +1240,7 @@ m4_defines += have ? ['-DHAVE_PAM'] : []
 #         libz = []
 # endif
 # conf.set10('HAVE_ZLIB', have)
-# 
+#
 # want_bzip2 = get_option('bzip2')
 # if want_bzip2 != 'false' and not fuzzer_build
 #         libbzip2 = cc.find_library('bz2',
@@ -1243,7 +1251,7 @@ m4_defines += have ? ['-DHAVE_PAM'] : []
 #         libbzip2 = []
 # endif
 # conf.set10('HAVE_BZIP2', have)
-# 
+#
 # want_xz = get_option('xz')
 # if want_xz != 'false' and not fuzzer_build
 #         libxz = dependency('liblzma',
@@ -1254,7 +1262,7 @@ m4_defines += have ? ['-DHAVE_PAM'] : []
 #         libxz = []
 # endif
 # conf.set10('HAVE_XZ', have)
-# 
+#
 # want_lz4 = get_option('lz4')
 # if want_lz4 != 'false' and not fuzzer_build
 #         liblz4 = dependency('liblz4',
@@ -1265,7 +1273,7 @@ m4_defines += have ? ['-DHAVE_PAM'] : []
 #         liblz4 = []
 # endif
 # conf.set10('HAVE_LZ4', have)
-# 
+#
 # want_xkbcommon = get_option('xkbcommon')
 # if want_xkbcommon != 'false' and not fuzzer_build
 #         libxkbcommon = dependency('xkbcommon',
@@ -1349,7 +1357,7 @@ conf.set10('HAVE_DBUS', have)
 # conf.set('DEFAULT_DNSSEC_MODE',
 #          'DNSSEC_' + default_dnssec.underscorify().to_upper())
 # substs.set('DEFAULT_DNSSEC_MODE', default_dnssec)
-# 
+#
 # want_importd = get_option('importd')
 # if want_importd != 'false'
 #         have = (conf.get('HAVE_LIBCURL') == 1 and
@@ -1364,7 +1372,7 @@ conf.set10('HAVE_DBUS', have)
 #         have = false
 # endif
 # conf.set10('ENABLE_IMPORTD', have)
-# 
+#
 # want_remote = get_option('remote')
 # if want_remote != 'false'
 #         have_deps = [conf.get('HAVE_MICROHTTPD') == 1,
@@ -1437,7 +1445,7 @@ conf.set10('SYSTEMD_SLOW_TESTS_DEFAULT', slow_tests)
 #if 0 /// UNNEEDED by elogind
 # if get_option('efi')
 #         efi_arch = host_machine.cpu_family()
-# 
+#
 #         if efi_arch == 'x86'
 #                 EFI_MACHINE_TYPE_NAME = 'ia32'
 #                 gnu_efi_arch = 'ia32'
@@ -1454,10 +1462,10 @@ conf.set10('SYSTEMD_SLOW_TESTS_DEFAULT', slow_tests)
 #                 EFI_MACHINE_TYPE_NAME = ''
 #                 gnu_efi_arch = ''
 #         endif
-# 
+#
 #         have = true
 #         conf.set_quoted('EFI_MACHINE_TYPE_NAME', EFI_MACHINE_TYPE_NAME)
-# 
+#
 #         conf.set('SD_TPM_PCR', get_option('tpm-pcrindex').to_int())
 # else
 #         have = false
@@ -1493,18 +1501,16 @@ includes = include_directories('src/basic',
 #                                'src/libsystemd/sd-netlink',
 #                                'src/libsystemd/sd-network',
 #                                'src/libsystemd-network',
-#                                '.')
 #else
                                'src/libelogind/sd-bus',
                                'src/libelogind/sd-id128',
                                'src/sleep',
                                'src/update-utmp',
 #endif // 0
+                               '.')
 
 add_project_arguments('-include', 'config.h', language : 'c')
 
-#if 0 /// UNNEEDED by elogind
-#endif // 0
 subdir('po')
 #if 0 /// UNNEEDED by elogind
 # subdir('catalog')
@@ -1530,15 +1536,17 @@ subdir('src/login')
 #         journald_gperf_c,
 #         include_directories : includes,
 #         install : false)
-# 
-# libsystemd_sym_path = '@0@/@1@'.format(meson.current_source_dir(), libsystemd_sym)
-# libsystemd = shared_library(
-#         'systemd',
-#         'src/systemd/sd-id128.h', # pick a header file at random to work around old meson bug
-#         version : libsystemd_version,
-#         include_directories : includes,
-#         link_args : ['-shared',
-#                      '-Wl,--version-script=' + libsystemd_sym_path],
+#endif // 0
+
+libelogind_sym_path = '@0@/@1@'.format(meson.current_source_dir(), libelogind_sym)
+libelogind = shared_library(
+        'elogind',
+        'src/systemd/sd-id128.h', # pick a header file at random to work around old meson bug
+        version : libelogind_version,
+        include_directories : includes,
+        link_args : ['-shared',
+                     '-Wl,--version-script=' + libelogind_sym_path],
+#if 0 /// elogind does not need gcrypt or libjournal_client, only threads.
 #         link_with : [libbasic,
 #                      libbasic_gcrypt],
 #         link_whole : [libsystemd_static,
@@ -1548,23 +1556,14 @@ subdir('src/login')
 #                         libxz,
 #                         liblz4],
 #         link_depends : libsystemd_sym,
-#         install : true,
-#         install_dir : rootlibdir)
 #else
-libelogind_sym_path = '@0@/@1@'.format(meson.current_source_dir(), libelogind_sym)
-libelogind = shared_library(
-        'elogind',
-        libelogind_internal_sources,
-        version : libelogind_version,
-        include_directories : includes,
-        link_args : ['-shared',
-                     '-Wl,--version-script=' + libelogind_sym_path],
         link_with : [libbasic],
+        link_whole : [libelogind_static],
         dependencies : [threads],
         link_depends : libelogind_sym,
+#endif // 0
         install : true,
         install_dir : rootlibdir)
-#endif // 0
 
 ############################################################
 
@@ -1583,7 +1582,7 @@ subdir('src/shared')
 # subdir('src/core')
 # subdir('src/udev')
 # subdir('src/network')
-# 
+#
 # subdir('src/analyze')
 # subdir('src/journal-remote')
 # subdir('src/coredump')
@@ -1601,8 +1600,8 @@ subdir('src/shared')
 #endif // 0
 
 subdir('src/test')
-subdir('src/fuzz')
-#if 0 /// UNNEEDED in elogind
+#if 0 /// UNNEEDED by elogind
+# subdir('src/fuzz')
 # subdir('rules')
 # subdir('test')
 #endif // 0
@@ -1623,14 +1622,14 @@ test_dlopen = executable(
 #                  ['systemd',    'ENABLE_NSS_SYSTEMD'],
 #                  ['mymachines', 'ENABLE_MACHINED'],
 #                  ['resolve',    'ENABLE_RESOLVE']]
-# 
+#
 #         condition = tuple[1] == '' or conf.get(tuple[1]) == 1
 #         if condition
 #                 module = tuple[0]
-# 
+#
 #                 sym = 'src/nss-@0@/nss-@0@.sym'.format(module)
 #                 version_script_arg = join_paths(meson.current_source_dir(), sym)
-# 
+#
 #                 nss = shared_library(
 #                         'nss_' + module,
 #                         'src/nss-@0@/nss-@0@.c'.format(module),
@@ -1648,13 +1647,13 @@ test_dlopen = executable(
 #                         link_depends : sym,
 #                         install : true,
 #                         install_dir : rootlibdir)
-# 
+#
 #                 # We cannot use shared_module because it does not support version suffix.
 #                 # Unfortunately shared_library insists on creating the symlink…
 #                 meson.add_install_script('sh', '-c',
 #                                          'rm $DESTDIR@0@/libnss_@1@.so'
 #                                          .format(rootlibdir, module))
-# 
+#
 #                 test('dlopen-nss_' + module,
 #                      test_dlopen,
 #                      args : [nss.full_path()]) # path to dlopen must include a slash
@@ -1679,11 +1678,11 @@ test_dlopen = executable(
 #            install_rpath : rootlibexecdir,
 #            install : true,
 #            install_dir : rootlibexecdir)
-# 
+#
 # meson.add_install_script(meson_make_symlink,
 #                          join_paths(rootlibexecdir, 'systemd'),
 #                          join_paths(rootsbindir, 'init'))
-# 
+#
 # exe = executable('systemd-analyze',
 #                  systemd_analyze_sources,
 #                  include_directories : includes,
@@ -1698,7 +1697,7 @@ test_dlopen = executable(
 #                  install_rpath : rootlibexecdir,
 #                  install : true)
 # public_programs += [exe]
-# 
+#
 # executable('systemd-journald',
 #            systemd_journald_sources,
 #            include_directories : includes,
@@ -1711,7 +1710,7 @@ test_dlopen = executable(
 #            install_rpath : rootlibexecdir,
 #            install : true,
 #            install_dir : rootlibexecdir)
-# 
+#
 # exe = executable('systemd-cat',
 #                  systemd_cat_sources,
 #                  include_directories : includes,
@@ -1721,7 +1720,7 @@ test_dlopen = executable(
 #                  install_rpath : rootlibexecdir,
 #                  install : true)
 # public_programs += [exe]
-# 
+#
 # exe = executable('journalctl',
 #                  journalctl_sources,
 #                  include_directories : includes,
@@ -1735,7 +1734,7 @@ test_dlopen = executable(
 #                  install : true,
 #                  install_dir : rootbindir)
 # public_programs += [exe]
-# 
+#
 # executable('systemd-getty-generator',
 #            'src/getty-generator/getty-generator.c',
 #            include_directories : includes,
@@ -1743,7 +1742,7 @@ test_dlopen = executable(
 #            install_rpath : rootlibexecdir,
 #            install : true,
 #            install_dir : systemgeneratordir)
-# 
+#
 # executable('systemd-debug-generator',
 #            'src/debug-generator/debug-generator.c',
 #            include_directories : includes,
@@ -1751,7 +1750,7 @@ test_dlopen = executable(
 #            install_rpath : rootlibexecdir,
 #            install : true,
 #            install_dir : systemgeneratordir)
-# 
+#
 # executable('systemd-fstab-generator',
 #            'src/fstab-generator/fstab-generator.c',
 #            'src/core/mount-setup.c',
@@ -1760,7 +1759,7 @@ test_dlopen = executable(
 #            install_rpath : rootlibexecdir,
 #            install : true,
 #            install_dir : systemgeneratordir)
-# 
+#
 # if conf.get('ENABLE_ENVIRONMENT_D') == 1
 #         executable('30-systemd-environment-d-generator',
 #                    'src/environment-d-generator/environment-d-generator.c',
@@ -1769,12 +1768,12 @@ test_dlopen = executable(
 #                    install_rpath : rootlibexecdir,
 #                    install : true,
 #                    install_dir : userenvgeneratordir)
-# 
+#
 #         meson.add_install_script(meson_make_symlink,
 #                                  join_paths(sysconfdir, 'environment'),
 #                                  join_paths(environmentdir, '99-environment.conf'))
 # endif
-# 
+#
 # if conf.get('ENABLE_HIBERNATE') == 1
 #         executable('systemd-hibernate-resume-generator',
 #                    'src/hibernate-resume/hibernate-resume-generator.c',
@@ -1783,7 +1782,7 @@ test_dlopen = executable(
 #                    install_rpath : rootlibexecdir,
 #                    install : true,
 #                    install_dir : systemgeneratordir)
-# 
+#
 #         executable('systemd-hibernate-resume',
 #                    'src/hibernate-resume/hibernate-resume.c',
 #                    include_directories : includes,
@@ -1792,7 +1791,7 @@ test_dlopen = executable(
 #                    install : true,
 #                    install_dir : rootlibexecdir)
 # endif
-# 
+#
 # if conf.get('HAVE_BLKID') == 1
 #         executable('systemd-gpt-auto-generator',
 #                    'src/gpt-auto-generator/gpt-auto-generator.c',
@@ -1803,7 +1802,7 @@ test_dlopen = executable(
 #                    install_rpath : rootlibexecdir,
 #                    install : true,
 #                    install_dir : systemgeneratordir)
-# 
+#
 #         exe = executable('systemd-dissect',
 #                          'src/dissect/dissect.c',
 #                          include_directories : includes,
@@ -1813,7 +1812,7 @@ test_dlopen = executable(
 #                          install_dir : rootlibexecdir)
 #         public_programs += [exe]
 # endif
-# 
+#
 # if conf.get('ENABLE_RESOLVE') == 1
 #         executable('systemd-resolved',
 #                    systemd_resolved_sources,
@@ -1828,7 +1827,7 @@ test_dlopen = executable(
 #                    install_rpath : rootlibexecdir,
 #                    install : true,
 #                    install_dir : rootlibexecdir)
-# 
+#
 #         exe = executable('systemd-resolve',
 #                          systemd_resolve_sources,
 #                          include_directories : includes,
@@ -1843,7 +1842,7 @@ test_dlopen = executable(
 #                          install : true)
 #         public_programs += [exe]
 # endif
-# 
+#
 # if conf.get('ENABLE_LOGIND') == 1
 #         executable('systemd-logind',
 #                    systemd_logind_sources,
@@ -1855,7 +1854,7 @@ test_dlopen = executable(
 #                    install_rpath : rootlibexecdir,
 #                    install : true,
 #                    install_dir : rootlibexecdir)
-# 
+#
 #         exe = executable('loginctl',
 #                          loginctl_sources,
 #                          include_directories : includes,
@@ -1867,7 +1866,7 @@ test_dlopen = executable(
 #                          install : true,
 #                          install_dir : rootbindir)
 #         public_programs += [exe]
-# 
+#
 #         exe = executable('systemd-inhibit',
 #                          'src/login/inhibit.c',
 #                          include_directories : includes,
@@ -1876,7 +1875,7 @@ test_dlopen = executable(
 #                          install : true,
 #                          install_dir : rootbindir)
 #         public_programs += [exe]
-# 
+#
 #         if conf.get('HAVE_PAM') == 1
 #                 version_script_arg = join_paths(meson.current_source_dir(), pam_systemd_sym)
 #                 pam_systemd = shared_library(
@@ -1894,7 +1893,7 @@ test_dlopen = executable(
 #                         link_depends : pam_systemd_sym,
 #                         install : true,
 #                         install_dir : pamlibdir)
-# 
+#
 #                 test('dlopen-pam_systemd',
 #                      test_dlopen,
 #                      args : [pam_systemd.full_path()]) # path to dlopen must include a slash
@@ -1967,7 +1966,7 @@ endif
 #                    install : true,
 #                    install_dir : rootlibexecdir)
 # endif
-# 
+#
 # if conf.get('ENABLE_EFI') == 1 and conf.get('HAVE_BLKID') == 1
 #         exe = executable('bootctl',
 #                          'src/boot/bootctl.c',
@@ -1978,7 +1977,7 @@ endif
 #                          install : true)
 #         public_programs += [exe]
 # endif
-# 
+#
 # exe = executable('systemd-socket-activate', 'src/activate/activate.c',
 #                  include_directories : includes,
 #                  link_with : [libshared],
@@ -1986,7 +1985,7 @@ endif
 #                  install_rpath : rootlibexecdir,
 #                  install : true)
 # public_programs += [exe]
-# 
+#
 # exe = executable('systemctl', 'src/systemctl/systemctl.c',
 #                  include_directories : includes,
 #                  link_with : [libshared],
@@ -1999,13 +1998,13 @@ endif
 #                  install : true,
 #                  install_dir : rootbindir)
 # public_programs += [exe]
-# 
+#
 # foreach alias : ['halt', 'poweroff', 'reboot', 'runlevel', 'shutdown', 'telinit']
 #         meson.add_install_script(meson_make_symlink,
 #                                  join_paths(rootbindir, 'systemctl'),
 #                                  join_paths(rootsbindir, alias))
 # endforeach
-# 
+#
 # if conf.get('ENABLE_BACKLIGHT') == 1
 #         executable('systemd-backlight',
 #                    'src/backlight/backlight.c',
@@ -2015,7 +2014,7 @@ endif
 #                    install : true,
 #                    install_dir : rootlibexecdir)
 # endif
-# 
+#
 # if conf.get('ENABLE_RFKILL') == 1
 #         executable('systemd-rfkill',
 #                    'src/rfkill/rfkill.c',
@@ -2025,7 +2024,7 @@ endif
 #                    install : true,
 #                    install_dir : rootlibexecdir)
 # endif
-# 
+#
 # executable('systemd-system-update-generator',
 #            'src/system-update-generator/system-update-generator.c',
 #            include_directories : includes,
@@ -2033,7 +2032,7 @@ endif
 #            install_rpath : rootlibexecdir,
 #            install : true,
 #            install_dir : systemgeneratordir)
-# 
+#
 # if conf.get('HAVE_LIBCRYPTSETUP') == 1
 #         executable('systemd-cryptsetup',
 #                    'src/cryptsetup/cryptsetup.c',
@@ -2043,7 +2042,7 @@ endif
 #                    install_rpath : rootlibexecdir,
 #                    install : true,
 #                    install_dir : rootlibexecdir)
-# 
+#
 #         executable('systemd-cryptsetup-generator',
 #                    'src/cryptsetup/cryptsetup-generator.c',
 #                    include_directories : includes,
@@ -2052,7 +2051,7 @@ endif
 #                    install_rpath : rootlibexecdir,
 #                    install : true,
 #                    install_dir : systemgeneratordir)
-# 
+#
 #         executable('systemd-veritysetup',
 #                    'src/veritysetup/veritysetup.c',
 #                    include_directories : includes,
@@ -2061,7 +2060,7 @@ endif
 #                    install_rpath : rootlibexecdir,
 #                    install : true,
 #                    install_dir : rootlibexecdir)
-# 
+#
 #         executable('systemd-veritysetup-generator',
 #                    'src/veritysetup/veritysetup-generator.c',
 #                    include_directories : includes,
@@ -2071,7 +2070,7 @@ endif
 #                    install : true,
 #                    install_dir : systemgeneratordir)
 # endif
-# 
+#
 # if conf.get('HAVE_SYSV_COMPAT') == 1
 #         executable('systemd-sysv-generator',
 #                    'src/sysv-generator/sysv-generator.c',
@@ -2080,7 +2079,7 @@ endif
 #                    install_rpath : rootlibexecdir,
 #                    install : true,
 #                    install_dir : systemgeneratordir)
-# 
+#
 #         executable('systemd-rc-local-generator',
 #                    'src/rc-local-generator/rc-local-generator.c',
 #                    include_directories : includes,
@@ -2089,7 +2088,7 @@ endif
 #                    install : true,
 #                    install_dir : systemgeneratordir)
 # endif
-# 
+#
 # if conf.get('ENABLE_HOSTNAMED') == 1
 #         executable('systemd-hostnamed',
 #                    'src/hostname/hostnamed.c',
@@ -2098,7 +2097,7 @@ endif
 #                    install_rpath : rootlibexecdir,
 #                    install : true,
 #                    install_dir : rootlibexecdir)
-# 
+#
 #         exe = executable('hostnamectl',
 #                          'src/hostname/hostnamectl.c',
 #                          include_directories : includes,
@@ -2107,7 +2106,7 @@ endif
 #                          install : true)
 #         public_programs += [exe]
 # endif
-# 
+#
 # if conf.get('ENABLE_LOCALED') == 1
 #         if conf.get('HAVE_XKBCOMMON') == 1
 #                 # logind will load libxkbcommon.so dynamically on its own
@@ -2115,7 +2114,7 @@ endif
 #         else
 #                 deps = []
 #         endif
-# 
+#
 #         executable('systemd-localed',
 #                    systemd_localed_sources,
 #                    include_directories : includes,
@@ -2124,7 +2123,7 @@ endif
 #                    install_rpath : rootlibexecdir,
 #                    install : true,
 #                    install_dir : rootlibexecdir)
-# 
+#
 #         exe = executable('localectl',
 #                          localectl_sources,
 #                          include_directories : includes,
@@ -2133,7 +2132,7 @@ endif
 #                          install : true)
 #         public_programs += [exe]
 # endif
-# 
+#
 # if conf.get('ENABLE_TIMEDATED') == 1
 #         executable('systemd-timedated',
 #                    'src/timedate/timedated.c',
@@ -2142,7 +2141,7 @@ endif
 #                    install_rpath : rootlibexecdir,
 #                    install : true,
 #                    install_dir : rootlibexecdir)
-# 
+#
 #         exe = executable('timedatectl',
 #                          'src/timedate/timedatectl.c',
 #                          include_directories : includes,
@@ -2151,7 +2150,7 @@ endif
 #                          install : true)
 #         public_programs += [exe]
 # endif
-# 
+#
 # if conf.get('ENABLE_TIMESYNCD') == 1
 #         executable('systemd-timesyncd',
 #                    systemd_timesyncd_sources,
@@ -2163,7 +2162,7 @@ endif
 #                    install : true,
 #                    install_dir : rootlibexecdir)
 # endif
-# 
+#
 # if conf.get('ENABLE_MACHINED') == 1
 #         executable('systemd-machined',
 #                    systemd_machined_sources,
@@ -2173,7 +2172,7 @@ endif
 #                    install_rpath : rootlibexecdir,
 #                    install : true,
 #                    install_dir : rootlibexecdir)
-# 
+#
 #         exe = executable('machinectl',
 #                          'src/machine/machinectl.c',
 #                          include_directories : includes,
@@ -2186,7 +2185,7 @@ endif
 #                          install_dir : rootbindir)
 #         public_programs += [exe]
 # endif
-# 
+#
 # if conf.get('ENABLE_IMPORTD') == 1
 #         executable('systemd-importd',
 #                    systemd_importd_sources,
@@ -2196,7 +2195,7 @@ endif
 #                    install_rpath : rootlibexecdir,
 #                    install : true,
 #                    install_dir : rootlibexecdir)
-# 
+#
 #         systemd_pull = executable('systemd-pull',
 #                                   systemd_pull_sources,
 #                                   include_directories : includes,
@@ -2209,7 +2208,7 @@ endif
 #                                   install_rpath : rootlibexecdir,
 #                                   install : true,
 #                                   install_dir : rootlibexecdir)
-# 
+#
 #         systemd_import = executable('systemd-import',
 #                                     systemd_import_sources,
 #                                     include_directories : includes,
@@ -2221,7 +2220,7 @@ endif
 #                                     install_rpath : rootlibexecdir,
 #                                     install : true,
 #                                     install_dir : rootlibexecdir)
-# 
+#
 #         systemd_export = executable('systemd-export',
 #                                     systemd_export_sources,
 #                                     include_directories : includes,
@@ -2235,7 +2234,7 @@ endif
 #                                     install_dir : rootlibexecdir)
 #         public_programs += [systemd_pull, systemd_import, systemd_export]
 # endif
-# 
+#
 # if conf.get('ENABLE_REMOTE') == 1 and conf.get('HAVE_LIBCURL') == 1
 #         exe = executable('systemd-journal-upload',
 #                          systemd_journal_upload_sources,
@@ -2251,7 +2250,7 @@ endif
 #                          install_dir : rootlibexecdir)
 #         public_programs += [exe]
 # endif
-# 
+#
 # if conf.get('ENABLE_REMOTE') == 1 and conf.get('HAVE_MICROHTTPD') == 1
 #         s_j_remote = executable('systemd-journal-remote',
 #                                 systemd_journal_remote_sources,
@@ -2265,7 +2264,7 @@ endif
 #                                 install_rpath : rootlibexecdir,
 #                                 install : true,
 #                                 install_dir : rootlibexecdir)
-# 
+#
 #         s_j_gatewayd = executable('systemd-journal-gatewayd',
 #                                   systemd_journal_gatewayd_sources,
 #                                   include_directories : includes,
@@ -2280,7 +2279,7 @@ endif
 #                                   install_dir : rootlibexecdir)
 #         public_programs += [s_j_remote, s_j_gatewayd]
 # endif
-# 
+#
 # if conf.get('ENABLE_COREDUMP') == 1
 #         executable('systemd-coredump',
 #                    systemd_coredump_sources,
@@ -2294,7 +2293,7 @@ endif
 #                    install_rpath : rootlibexecdir,
 #                    install : true,
 #                    install_dir : rootlibexecdir)
-# 
+#
 #         exe = executable('coredumpctl',
 #                          coredumpctl_sources,
 #                          include_directories : includes,
@@ -2306,7 +2305,7 @@ endif
 #                          install : true)
 #         public_programs += [exe]
 # endif
-# 
+#
 # if conf.get('ENABLE_BINFMT') == 1
 #         exe = executable('systemd-binfmt',
 #                          'src/binfmt/binfmt.c',
@@ -2316,13 +2315,13 @@ endif
 #                          install : true,
 #                          install_dir : rootlibexecdir)
 #         public_programs += [exe]
-# 
+#
 #         meson.add_install_script('sh', '-c',
 #                                  mkdir_p.format(binfmtdir))
 #         meson.add_install_script('sh', '-c',
 #                                  mkdir_p.format(join_paths(sysconfdir, 'binfmt.d')))
 # endif
-# 
+#
 # if conf.get('ENABLE_VCONSOLE') == 1
 #         executable('systemd-vconsole-setup',
 #                    'src/vconsole/vconsole-setup.c',
@@ -2332,7 +2331,7 @@ endif
 #                    install : true,
 #                    install_dir : rootlibexecdir)
 # endif
-# 
+#
 # if conf.get('ENABLE_RANDOMSEED') == 1
 #         executable('systemd-random-seed',
 #                    'src/random-seed/random-seed.c',
@@ -2342,7 +2341,7 @@ endif
 #                    install : true,
 #                    install_dir : rootlibexecdir)
 # endif
-# 
+#
 # if conf.get('ENABLE_FIRSTBOOT') == 1
 #         executable('systemd-firstboot',
 #                    'src/firstboot/firstboot.c',
@@ -2353,7 +2352,7 @@ endif
 #                    install : true,
 #                    install_dir : rootbindir)
 # endif
-# 
+#
 # executable('systemd-remount-fs',
 #            'src/remount-fs/remount-fs.c',
 #            'src/core/mount-setup.c',
@@ -2363,7 +2362,7 @@ endif
 #            install_rpath : rootlibexecdir,
 #            install : true,
 #            install_dir : rootlibexecdir)
-# 
+#
 # executable('systemd-machine-id-setup',
 #            'src/machine-id-setup/machine-id-setup-main.c',
 #            'src/core/machine-id-setup.c',
@@ -2373,7 +2372,7 @@ endif
 #            install_rpath : rootlibexecdir,
 #            install : true,
 #            install_dir : rootbindir)
-# 
+#
 # executable('systemd-fsck',
 #            'src/fsck/fsck.c',
 #            include_directories : includes,
@@ -2381,7 +2380,7 @@ endif
 #            install_rpath : rootlibexecdir,
 #            install : true,
 #            install_dir : rootlibexecdir)
-# 
+#
 # executable('elogind-growfs',
 #            'src/partition/growfs.c',
 #            include_directories : includes,
@@ -2390,7 +2389,7 @@ endif
 #            install_rpath : rootlibexecdir,
 #            install : true,
 #            install_dir : rootlibexecdir)
-# 
+#
 # executable('elogind-makefs',
 #            'src/partition/makefs.c',
 #            include_directories : includes,
@@ -2398,7 +2397,7 @@ endif
 #            install_rpath : rootlibexecdir,
 #            install : true,
 #            install_dir : rootlibexecdir)
-# 
+#
 # executable('systemd-sleep',
 #            'src/sleep/sleep.c',
 #            include_directories : includes,
@@ -2406,7 +2405,7 @@ endif
 #            install_rpath : rootlibexecdir,
 #            install : true,
 #            install_dir : rootlibexecdir)
-# 
+#
 # exe = executable('systemd-sysctl',
 #                  'src/sysctl/sysctl.c',
 #                  include_directories : includes,
@@ -2415,7 +2414,7 @@ endif
 #                  install : true,
 #                  install_dir : rootlibexecdir)
 # public_programs += [exe]
-# 
+#
 # executable('systemd-ac-power',
 #            'src/ac-power/ac-power.c',
 #            include_directories : includes,
@@ -2423,7 +2422,7 @@ endif
 #            install_rpath : rootlibexecdir,
 #            install : true,
 #            install_dir : rootlibexecdir)
-# 
+#
 # exe = executable('systemd-detect-virt',
 #                  'src/detect-virt/detect-virt.c',
 #                  include_directories : includes,
@@ -2431,7 +2430,7 @@ endif
 #                  install_rpath : rootlibexecdir,
 #                  install : true)
 # public_programs += [exe]
-# 
+#
 # exe = executable('systemd-delta',
 #                  'src/delta/delta.c',
 #                  include_directories : includes,
@@ -2439,7 +2438,7 @@ endif
 #                  install_rpath : rootlibexecdir,
 #                  install : true)
 # public_programs += [exe]
-# 
+#
 # exe = executable('systemd-escape',
 #                  'src/escape/escape.c',
 #                  include_directories : includes,
@@ -2448,7 +2447,7 @@ endif
 #                  install : true,
 #                  install_dir : rootbindir)
 # public_programs += [exe]
-# 
+#
 # exe = executable('systemd-notify',
 #                  'src/notify/notify.c',
 #                  include_directories : includes,
@@ -2457,7 +2456,7 @@ endif
 #                  install : true,
 #                  install_dir : rootbindir)
 # public_programs += [exe]
-# 
+#
 # executable('systemd-volatile-root',
 #            'src/volatile-root/volatile-root.c',
 #            include_directories : includes,
@@ -2465,7 +2464,7 @@ endif
 #            install_rpath : rootlibexecdir,
 #            install : true,
 #            install_dir : rootlibexecdir)
-# 
+#
 # executable('systemd-cgroups-agent',
 #            'src/cgroups-agent/cgroups-agent.c',
 #            include_directories : includes,
@@ -2491,7 +2490,7 @@ executable('elogind-cgroups-agent',
 #                  install_rpath : rootlibexecdir,
 #                  install : true)
 # public_programs += [exe]
-# 
+#
 # exe = executable('systemd-ask-password',
 #                  'src/ask-password/ask-password.c',
 #                  include_directories : includes,
@@ -2500,7 +2499,7 @@ executable('elogind-cgroups-agent',
 #                  install : true,
 #                  install_dir : rootbindir)
 # public_programs += [exe]
-# 
+#
 # executable('systemd-reply-password',
 #            'src/reply-password/reply-password.c',
 #            include_directories : includes,
@@ -2508,7 +2507,7 @@ executable('elogind-cgroups-agent',
 #            install_rpath : rootlibexecdir,
 #            install : true,
 #            install_dir : rootlibexecdir)
-# 
+#
 # exe = executable('systemd-tty-ask-password-agent',
 #                  'src/tty-ask-password-agent/tty-ask-password-agent.c',
 #                  include_directories : includes,
@@ -2517,7 +2516,7 @@ executable('elogind-cgroups-agent',
 #                  install : true,
 #                  install_dir : rootbindir)
 # public_programs += [exe]
-# 
+#
 # exe = executable('systemd-cgls',
 #                  'src/cgls/cgls.c',
 #                  include_directories : includes,
@@ -2525,7 +2524,7 @@ executable('elogind-cgroups-agent',
 #                  install_rpath : rootlibexecdir,
 #                  install : true)
 # public_programs += [exe]
-# 
+#
 # exe = executable('systemd-cgtop',
 #                  'src/cgtop/cgtop.c',
 #                  include_directories : includes,
@@ -2533,7 +2532,7 @@ executable('elogind-cgroups-agent',
 #                  install_rpath : rootlibexecdir,
 #                  install : true)
 # public_programs += [exe]
-# 
+#
 # executable('systemd-initctl',
 #            'src/initctl/initctl.c',
 #            include_directories : includes,
@@ -2541,7 +2540,7 @@ executable('elogind-cgroups-agent',
 #            install_rpath : rootlibexecdir,
 #            install : true,
 #            install_dir : rootlibexecdir)
-# 
+#
 # exe = executable('systemd-mount',
 #                  'src/mount/mount-tool.c',
 #                  include_directories : includes,
@@ -2549,10 +2548,10 @@ executable('elogind-cgroups-agent',
 #                  install_rpath : rootlibexecdir,
 #                  install : true)
 # public_programs += [exe]
-# 
+#
 # meson.add_install_script(meson_make_symlink,
 #                          'systemd-mount', join_paths(bindir, 'systemd-umount'))
-# 
+#
 # exe = executable('systemd-run',
 #                  'src/run/run.c',
 #                  include_directories : includes,
@@ -2560,7 +2559,7 @@ executable('elogind-cgroups-agent',
 #                  install_rpath : rootlibexecdir,
 #                  install : true)
 # public_programs += [exe]
-# 
+#
 # exe = executable('systemd-stdio-bridge',
 #                  'src/stdio-bridge/stdio-bridge.c',
 #                  include_directories : includes,
@@ -2568,7 +2567,7 @@ executable('elogind-cgroups-agent',
 #                  install_rpath : rootlibexecdir,
 #                  install : true)
 # public_programs += [exe]
-# 
+#
 # exe = executable('busctl',
 #                  'src/busctl/busctl.c',
 #                  'src/busctl/busctl-introspect.c',
@@ -2578,7 +2577,7 @@ executable('elogind-cgroups-agent',
 #                  install_rpath : rootlibexecdir,
 #                  install : true)
 # public_programs += [exe]
-# 
+#
 # if conf.get('ENABLE_SYSUSERS') == 1
 #         exe = executable('systemd-sysusers',
 #                          'src/sysusers/sysusers.c',
@@ -2589,7 +2588,7 @@ executable('elogind-cgroups-agent',
 #                          install_dir : rootbindir)
 #         public_programs += [exe]
 # endif
-# 
+#
 # if conf.get('ENABLE_TMPFILES') == 1
 #         exe = executable('systemd-tmpfiles',
 #                          'src/tmpfiles/tmpfiles.c',
@@ -2600,13 +2599,13 @@ executable('elogind-cgroups-agent',
 #                          install : true,
 #                          install_dir : rootbindir)
 #         public_programs += [exe]
-# 
+#
 #         test('test-systemd-tmpfiles',
 #              test_systemd_tmpfiles_py,
 #              args : exe.full_path())
 #         # https://github.com/mesonbuild/meson/issues/2681
 # endif
-# 
+#
 # if conf.get('ENABLE_HWDB') == 1
 #         exe = executable('systemd-hwdb',
 #                          'src/hwdb/hwdb.c',
@@ -2618,7 +2617,7 @@ executable('elogind-cgroups-agent',
 #                          install_dir : rootbindir)
 #         public_programs += [exe]
 # endif
-# 
+#
 # if conf.get('ENABLE_QUOTACHECK') == 1
 #         executable('systemd-quotacheck',
 #                    'src/quotacheck/quotacheck.c',
@@ -2628,7 +2627,7 @@ executable('elogind-cgroups-agent',
 #                    install : true,
 #                    install_dir : rootlibexecdir)
 # endif
-# 
+#
 # exe = executable('systemd-socket-proxyd',
 #                  'src/socket-proxy/socket-proxyd.c',
 #                  include_directories : includes,
@@ -2638,7 +2637,7 @@ executable('elogind-cgroups-agent',
 #                  install : true,
 #                  install_dir : rootlibexecdir)
 # public_programs += [exe]
-# 
+#
 # exe = executable('systemd-udevd',
 #                  systemd_udevd_sources,
 #                  include_directories : includes,
@@ -2655,7 +2654,7 @@ executable('elogind-cgroups-agent',
 #                  install : true,
 #                  install_dir : rootlibexecdir)
 # public_programs += [exe]
-# 
+#
 # exe = executable('udevadm',
 #                  udevadm_sources,
 #                  c_args : ['-DLOG_REALM=LOG_REALM_UDEV'],
@@ -2672,7 +2671,7 @@ executable('elogind-cgroups-agent',
 #                  install : true,
 #                  install_dir : rootbindir)
 # public_programs += [exe]
-# 
+#
 # executable('systemd-shutdown',
 #            systemd_shutdown_sources,
 #            include_directories : includes,
@@ -2680,7 +2679,7 @@ executable('elogind-cgroups-agent',
 #            install_rpath : rootlibexecdir,
 #            install : true,
 #            install_dir : rootlibexecdir)
-# 
+#
 # executable('systemd-update-done',
 #            'src/update-done/update-done.c',
 #            include_directories : includes,
@@ -2688,7 +2687,7 @@ executable('elogind-cgroups-agent',
 #            install_rpath : rootlibexecdir,
 #            install : true,
 #            install_dir : rootlibexecdir)
-# 
+#
 # executable('systemd-update-utmp',
 #            'src/update-utmp/update-utmp.c',
 #            include_directories : includes,
@@ -2697,7 +2696,7 @@ executable('elogind-cgroups-agent',
 #            install_rpath : rootlibexecdir,
 #            install : true,
 #            install_dir : rootlibexecdir)
-# 
+#
 # if conf.get('HAVE_KMOD') == 1
 #         executable('systemd-modules-load',
 #                    'src/modules-load/modules-load.c',
@@ -2707,13 +2706,13 @@ executable('elogind-cgroups-agent',
 #                    install_rpath : rootlibexecdir,
 #                    install : true,
 #                    install_dir : rootlibexecdir)
-# 
+#
 #         meson.add_install_script('sh', '-c',
 #                                  mkdir_p.format(modulesloaddir))
 #         meson.add_install_script('sh', '-c',
 #                                  mkdir_p.format(join_paths(sysconfdir, 'modules-load.d')))
 # endif
-# 
+#
 # exe = executable('systemd-nspawn',
 #                  systemd_nspawn_sources,
 #                  'src/core/mount-setup.c', # FIXME: use a variable?
@@ -2729,7 +2728,7 @@ executable('elogind-cgroups-agent',
 #                  install_rpath : rootlibexecdir,
 #                  install : true)
 # public_programs += [exe]
-# 
+#
 # if conf.get('ENABLE_NETWORKD') == 1
 #         executable('systemd-networkd',
 #                    systemd_networkd_sources,
@@ -2742,7 +2741,7 @@ executable('elogind-cgroups-agent',
 #                    install_rpath : rootlibexecdir,
 #                    install : true,
 #                    install_dir : rootlibexecdir)
-# 
+#
 #         executable('systemd-networkd-wait-online',
 #                    systemd_networkd_wait_online_sources,
 #                    include_directories : includes,
@@ -2751,7 +2750,7 @@ executable('elogind-cgroups-agent',
 #                    install_rpath : rootlibexecdir,
 #                    install : true,
 #                    install_dir : rootlibexecdir)
-# 
+#
 #         exe = executable('networkctl',
 #                    networkctl_sources,
 #                    include_directories : includes,
@@ -2762,7 +2761,7 @@ executable('elogind-cgroups-agent',
 #                    install_dir : rootbindir)
 #         public_programs += [exe]
 # endif
-# 
+#
 # executable('systemd-sulogin-shell',
 #            ['src/sulogin-shell/sulogin-shell.c'],
 #            include_directories : includes,
@@ -2838,7 +2837,7 @@ endforeach
 #         install_dir : testsdir)
 # test('test-libsystemd-sym',
 #      test_libsystemd_sym)
-# 
+#
 # test_libudev_sym = executable(
 #         'test-libudev-sym',
 #         test_libudev_sym_c,
@@ -2849,26 +2848,26 @@ endforeach
 #         install_dir : testsdir)
 # test('test-libudev-sym',
 #      test_libudev_sym)
-# 
+#
 # ############################################################
-# 
+#
 # fuzzer_exes = []
-# 
+#
 # foreach tuple : fuzzers
 #         sources = tuple[0]
 #         link_with = tuple[1].length() > 0 ? tuple[1] : [libshared]
 #         dependencies = tuple[2]
 #         defs = tuple.length() >= 4 ? tuple[3] : []
 #         incs = tuple.length() >= 5 ? tuple[4] : includes
-# 
+#
 #         if fuzzer_build
 #                 dependencies += fuzzing_engine
 #         else
 #                 sources += 'src/fuzz/fuzz-main.c'
 #         endif
-# 
+#
 #         name = sources[0].split('/')[-1].split('.')[0]
-# 
+#
 #         fuzzer_exes += executable(
 #                 name,
 #                 sources,
@@ -2878,13 +2877,13 @@ endforeach
 #                 c_args : defs,
 #                 install : false)
 # endforeach
-# 
+#
 # run_target('fuzzers',
 #         depends : fuzzer_exes,
 #         command : ['true'])
-# 
+#
 # ############################################################
-# 
+#
 #else
 test_libelogind_sym = executable(
         'test-libelogind-sym',
@@ -2901,7 +2900,7 @@ make_man_index_py = find_program('tools/make-man-index.py')
 xml_helper_py = find_program('tools/xml_helper.py')
 #if 0 /// UNNEEDED by elogind
 # hwdb_update_sh = find_program('tools/meson-hwdb-update.sh')
-# 
+#
 # subdir('units')
 # subdir('sysctl.d')
 # subdir('sysusers.d')
@@ -2937,12 +2936,14 @@ install_data('LICENSE.GPL2',
              'NEWS',
              'README',
              'doc/CODING_STYLE',
-             'doc/DISTRO_PORTING',
-             'doc/ENVIRONMENT.md',
-             'doc/HACKING',
-             'doc/TRANSIENT-SETTINGS.md',
-             'doc/TRANSLATORS',
-             'doc/UIDS-GIDS.md',
+#if 0 /// irrelevant for elogind
+#              'doc/DISTRO_PORTING',
+#              'doc/ENVIRONMENT.md',
+#              'doc/HACKING',
+#              'doc/TRANSIENT-SETTINGS.md',
+#              'doc/TRANSLATORS',
+#              'doc/UIDS-GIDS.md',
+#endif // 0
              'src/libelogind/sd-bus/GVARIANT-SERIALIZATION',
              install_dir : docdir)
 
@@ -2964,47 +2965,49 @@ endforeach
 
 ############################################################
 
-prev = ''
-foreach p : fuzz_regression_tests
-        a = p.split('/')[-3]
-        b = p.split('/')[-2]
-        c = p.split('/')[-1]
-
-        if a == 'address'
-                build = sanitize_address
-        else
-                error('unknown sanitizer @0@'.format(a))
-        endif
-
-        name = '@1@:@0@'.format(a, b)
-
-        if name != prev
-                if want_tests == 'false'
-                        message('Not compiling @0@ because tests is set to false'.format(name))
-                elif not sanitizers.contains(a)
-                        message('Not compiling @0@ because @1@ sanitizer is not available'.format(name, a))
-                elif slow_tests
-                        exe = custom_target(
-                                name,
-                                output : name,
-                                depends : build,
-                                command : [env, 'ln', '-fs',
-                                           join_paths(build.full_path(), b),
-                                           '@OUTPUT@'],
-                                build_by_default : true)
-                else
-                        message('Not compiling @0@ because slow-tests is set to false'.format(name))
-                endif
-        endif
-        prev = name
-
-        if want_tests != 'false' and slow_tests
-                test(c, env, args : [exe.full_path(),
-                                     join_paths(meson.source_root(),
-                                                'test/fuzz-regressions',
-                                                p)])
-        endif
-endforeach
+#if 0 /// fuzz regression tests are not supported by elogind
+# prev = ''
+# foreach p : fuzz_regression_tests
+#         a = p.split('/')[-3]
+#         b = p.split('/')[-2]
+#         c = p.split('/')[-1]
+#
+#         if a == 'address'
+#                 build = sanitize_address
+#         else
+#                 error('unknown sanitizer @0@'.format(a))
+#         endif
+#
+#         name = '@1@:@0@'.format(a, b)
+#
+#         if name != prev
+#                 if want_tests == 'false'
+#                         message('Not compiling @0@ because tests is set to false'.format(name))
+#                 elif not sanitizers.contains(a)
+#                         message('Not compiling @0@ because @1@ sanitizer is not available'.format(name, a))
+#                 elif slow_tests
+#                         exe = custom_target(
+#                                 name,
+#                                 output : name,
+#                                 depends : build,
+#                                 command : [env, 'ln', '-fs',
+#                                            join_paths(build.full_path(), b),
+#                                            '@OUTPUT@'],
+#                                 build_by_default : true)
+#                 else
+#                         message('Not compiling @0@ because slow-tests is set to false'.format(name))
+#                 endif
+#         endif
+#         prev = name
+#
+#         if want_tests != 'false' and slow_tests
+#                 test(c, env, args : [exe.full_path(),
+#                                      join_paths(meson.source_root(),
+#                                                 'test/fuzz-regressions',
+#                                                 p)])
+#         endif
+# endforeach
+#endif // 0
 
 ############################################################
 
@@ -3059,8 +3062,13 @@ endif
 meson_check_api_docs_sh = find_program('tools/meson-check-api-docs.sh')
 run_target(
         'check-api-docs',
-        depends : [man, libelogind, libudev],
-        command : [meson_check_api_docs_sh, libelogind.full_path(), libudev.full_path()])
+#if 0 /// libudev is external, elogind does not need to document it.
+#         depends : [man, libsystemd, libudev],
+#         command : [meson_check_api_docs_sh, libsystemd.full_path(), libudev.full_path()])
+#else
+        depends : [man, libelogind],
+        command : [meson_check_api_docs_sh, libelogind.full_path()])
+#endif // 0
 
 ############################################################
 
@@ -3115,7 +3123,7 @@ status = [
 #         'nobody group name:                 @0@'.format(nobody_group),
 #         'fallback hostname:                 @0@'.format(get_option('fallback-hostname')),
 #         'symbolic gateway hostnames:        @0@'.format(', '.join(gateway_hostnames)),
-# 
+#
 #         'default DNSSEC mode:               @0@'.format(default_dnssec),
 #         'default cgroup hierarchy:          @0@'.format(default_hierarchy),
 #endif // 0
@@ -3127,7 +3135,7 @@ status = [
 # status += [
 #         'default DNS servers:               @0@'.format(alt_dns_servers),
 #         'default NTP servers:               @0@'.format(alt_ntp_servers)]
-# 
+#
 # alt_time_epoch = run_command('date', '-Is', '-u', '-d',
 #                              '@@0@'.format(time_epoch)).stdout().strip()
 # status += [
@@ -3143,7 +3151,7 @@ status = [
 # if conf.get('ENABLE_EFI') == 1
 #         status += [
 #                 'efi arch:                          @0@'.format(efi_arch)]
-# 
+#
 #         if have_gnu_efi
 #                 status += [
 #                         'EFI machine type:                  @0@'.format(EFI_MACHINE_TYPE_NAME),
@@ -3250,8 +3258,8 @@ foreach tuple : [
         ['debug mmap cache'],
 ]
 
-        cond = tuple.get(1, '')
-        if cond == ''
+        cond = tuple.get(1, false)
+        if cond == false
                 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
diff --git a/meson_options.txt b/meson_options.txt
index bbaeeb690..3536f3ddf 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -16,8 +16,10 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with elogind; If not, see <http://www.gnu.org/licenses/>.
 
-option('split-usr', type : 'boolean', value : false,
-       description : '''assume that /bin, /sbin aren't symlinks into /usr''')
+option('split-usr', type : 'combo', choices : ['auto', 'true', 'false'],
+       description : '''/bin, /sbin aren't symlinks into /usr''')
+option('split-bin', type : 'combo', choices : ['auto', 'true', 'false'],
+       description : '''sbin is not a symlink to bin''')
 option('rootlibdir', type : 'string',
        description : '''[/usr]/lib/x86_64-linux-gnu or such''')
 option('rootprefix', type : 'string',
@@ -367,7 +369,9 @@ option('ok-color', type: 'combo',
        value : 'green',
        description: 'color of the "OK" status message')
 
-option('oss-fuzz', type : 'boolean', value : 'false',
-       description : 'build against oss-fuzz')
-option('llvm-fuzz', type : 'boolean', value : 'false',
-       description : 'build against LLVM libFuzzer')
+#if 0 /// fuzz regression tests are not supported by elogind
+# option('oss-fuzz', type : 'boolean', value : 'false',
+#        description : 'build against oss-fuzz')
+# option('llvm-fuzz', type : 'boolean', value : 'false',
+#        description : 'build against LLVM libFuzzer')
+#endif // 0