]> git.ipfire.org Git - thirdparty/systemd.git/blobdiff - meson.build
meson: also search for libcap directly
[thirdparty/systemd.git] / meson.build
index 154f3802239a25ae601a33313b49203190e1353b..c412aff91f23361cd8bd6c1c774587131d5538ec 100644 (file)
@@ -1,15 +1,13 @@
-# -*- mode: meson -*-
-
 project('systemd', 'c',
         version : '233',
         license : 'LGPLv2+',
         default_options: [
-          'c_std=gnu99',
-          'prefix=/usr',
-          'sysconfdir=/etc',
-          'localstatedir=/var',
+                'c_std=gnu99',
+                'prefix=/usr',
+                'sysconfdir=/etc',
+                'localstatedir=/var',
         ],
-        meson_version : '>= 0.39.1',
+        meson_version : '>= 0.40',
        )
 
 # We need the same data in three different formats, ugh!
@@ -28,18 +26,20 @@ m4_defines = []
 
 #####################################################################
 
+rootprefixdir = get_option('rootprefix')
 if get_option('split-usr')
-  conf.set('HAVE_SPLIT_USR', 1)
-  rootprefixdir = '/'
+        conf.set('HAVE_SPLIT_USR', 1)
+        rootprefixdir = rootprefixdir != '' ? rootprefixdir : '/'
 else
-  rootprefixdir = '/usr'
+        rootprefixdir = rootprefixdir != '' ? rootprefixdir : '/usr'
 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,
-           description : 'SysV init scripts and rcN.d links are supported')
+        conf.set('HAVE_SYSV_COMPAT', 1,
+                 description : 'SysV init scripts and rcN.d links are supported')
+        m4_defines += ['-DHAVE_SYSV_COMPAT']
 endif
 
 # join_paths ignore the preceding arguments if an absolute component is
@@ -47,7 +47,7 @@ endif
 # absolute or relative.
 prefixdir = get_option('prefix')
 if not prefixdir.startswith('/')
-  error('Prefix is not absolute: "@0@"'.format(prefixdir))
+        error('Prefix is not absolute: "@0@"'.format(prefixdir))
 endif
 bindir = join_paths(prefixdir, get_option('bindir'))
 libdir = join_paths(prefixdir, get_option('libdir'))
@@ -61,125 +61,134 @@ rootlibexecdir = join_paths(rootprefixdir, 'lib/systemd')
 
 rootlibdir = get_option('rootlibdir')
 if rootlibdir == ''
-  rootlibdir = join_paths(rootprefixdir, libdir.split('/')[-1])
+        rootlibdir = join_paths(rootprefixdir, libdir.split('/')[-1])
 endif
 
 # Dirs of external packages
-pkgconfigdatadir = datadir + '/pkgconfig'
-pkgconfiglibdir = libdir + '/pkgconfig'
-polkitpolicydir = datadir + '/polkit-1/actions'
-polkitrulesdir = datadir + '/polkit-1/rules.d'
-polkitpkladir = localstatedir + '/lib/polkit-1/localauthority/10-vendor.d'
-varlogdir = localstatedir + '/log'
-xinitrcdir = sysconfdir + '/X11/xinit/xinitrc.d'
+pkgconfigdatadir = join_paths(datadir, 'pkgconfig')
+pkgconfiglibdir = join_paths(libdir, 'pkgconfig')
+polkitpolicydir = join_paths(datadir, 'polkit-1/actions')
+polkitrulesdir = join_paths(datadir, 'polkit-1/rules.d')
+polkitpkladir = join_paths(localstatedir, 'lib/polkit-1/localauthority/10-vendor.d')
+varlogdir = join_paths(localstatedir, 'log')
+xinitrcdir = join_paths(sysconfdir, 'X11/xinit/xinitrc.d')
 rpmmacrosdir = get_option('rpmmacrosdir')
 
 # Our own paths
-pkgdatadir = datadir + '/systemd'
-environmentdir = prefixdir + '/lib/environment.d'
-pkgsysconfdir = sysconfdir + '/systemd'
-userunitdir = prefixdir + '/lib/systemd/user'
-userpresetdir = prefixdir + '/lib/systemd/user-preset'
-tmpfilesdir = prefixdir + '/lib/tmpfiles.d'
-sysusersdir = prefixdir + '/lib/sysusers.d'
-sysctldir = prefixdir + '/lib/sysctl.d'
-binfmtdir = prefixdir + '/lib/binfmt.d'
-modulesloaddir = prefixdir + '/lib/modules-load.d'
-networkdir = rootprefixdir + '/lib/systemd/network'
-pkgincludedir = includedir + '/systemd'
-systemgeneratordir = rootlibexecdir + '/system-generators'
-usergeneratordir = prefixdir + '/lib/systemd/user-generators'
-systemenvgeneratordir = prefixdir + '/lib/systemd/system-environment-generators'
-userenvgeneratordir = prefixdir + '/lib/systemd/user-environment-generators'
-systemshutdowndir = rootlibexecdir + '/system-shutdown'
-systemsleepdir = rootlibexecdir + '/system-sleep'
-systemunitdir = rootprefixdir + '/lib/systemd/system'
-systempresetdir = rootprefixdir + '/lib/systemd/system-preset'
-udevlibexecdir = rootprefixdir + '/lib/udev'
-udevhomedir = udevlibexecdir + ''
-udevrulesdir = udevlibexecdir + '/rules.d'
-udevhwdbdir = udevlibexecdir + '/hwdb.d'
-catalogdir = prefixdir + '/lib/systemd/catalog'
-kernelinstalldir = prefixdir + '/lib/kernel/install.d'
-factorydir = datadir + '/factory'
-docdir = datadir + '/doc/systemd'
-bootlibdir = prefixdir + '/lib/systemd/boot/efi'
-testsdir = prefixdir + '/lib/systemd/tests'
-systemdstatedir = localstatedir + '/lib/systemd'
-catalogstatedir = systemdstatedir + '/catalog'
+pkgdatadir = join_paths(datadir, 'systemd')
+environmentdir = join_paths(prefixdir, 'lib/environment.d')
+pkgsysconfdir = join_paths(sysconfdir, 'systemd')
+userunitdir = join_paths(prefixdir, 'lib/systemd/user')
+userpresetdir = join_paths(prefixdir, 'lib/systemd/user-preset')
+tmpfilesdir = join_paths(prefixdir, 'lib/tmpfiles.d')
+sysusersdir = join_paths(prefixdir, 'lib/sysusers.d')
+sysctldir = join_paths(prefixdir, 'lib/sysctl.d')
+binfmtdir = join_paths(prefixdir, 'lib/binfmt.d')
+modulesloaddir = join_paths(prefixdir, 'lib/modules-load.d')
+networkdir = join_paths(rootprefixdir, 'lib/systemd/network')
+pkgincludedir = join_paths(includedir, 'systemd')
+systemgeneratordir = join_paths(rootlibexecdir, 'system-generators')
+usergeneratordir = join_paths(prefixdir, 'lib/systemd/user-generators')
+systemenvgeneratordir = join_paths(prefixdir, 'lib/systemd/system-environment-generators')
+userenvgeneratordir = join_paths(prefixdir, 'lib/systemd/user-environment-generators')
+systemshutdowndir = join_paths(rootlibexecdir, 'system-shutdown')
+systemsleepdir = join_paths(rootlibexecdir, 'system-sleep')
+systemunitdir = join_paths(rootprefixdir, 'lib/systemd/system')
+systempresetdir = join_paths(rootprefixdir, 'lib/systemd/system-preset')
+udevlibexecdir = join_paths(rootprefixdir, 'lib/udev')
+udevhomedir = udevlibexecdir
+udevrulesdir = join_paths(udevlibexecdir, 'rules.d')
+udevhwdbdir = join_paths(udevlibexecdir, 'hwdb.d')
+catalogdir = join_paths(prefixdir, 'lib/systemd/catalog')
+kernelinstalldir = join_paths(prefixdir, 'lib/kernel/install.d')
+factorydir = join_paths(datadir, 'factory')
+docdir = join_paths(datadir, 'doc/systemd')
+bootlibdir = join_paths(prefixdir, 'lib/systemd/boot/efi')
+testsdir = join_paths(prefixdir, 'lib/systemd/tests')
+systemdstatedir = join_paths(localstatedir, 'lib/systemd')
+catalogstatedir = join_paths(systemdstatedir, 'catalog')
+randomseeddir = join_paths(localstatedir, 'lib/systemd')
 
 dbuspolicydir = get_option('dbuspolicydir')
 if dbuspolicydir == ''
-  dbuspolicydir = datadir + '/dbus-1/system.d'
+        dbuspolicydir = join_paths(datadir, 'dbus-1/system.d')
 endif
 
 dbussessionservicedir = get_option('dbussessionservicedir')
 if dbussessionservicedir == ''
-  dbussessionservicedir = datadir + '/dbus-1/services'
+        dbussessionservicedir = join_paths(datadir, 'dbus-1/services')
 endif
 
 dbussystemservicedir = get_option('dbussystemservicedir')
 if dbussystemservicedir == ''
-  dbussystemservicedir = datadir + '/dbus-1/system-services'
+        dbussystemservicedir = join_paths(datadir, 'dbus-1/system-services')
 endif
 
 pamlibdir = get_option('pamlibdir')
 if pamlibdir == ''
-  pamlibdir = rootlibdir + '/security'
+        pamlibdir = join_paths(rootlibdir, 'security')
 endif
 
 pamconfdir = get_option('pamconfdir')
 if pamconfdir == ''
-  pamconfdir = sysconfdir + '/pam.d'
+        pamconfdir = join_paths(sysconfdir, 'pam.d')
 endif
 
 conf.set_quoted('PKGSYSCONFDIR',                              pkgsysconfdir)
-conf.set_quoted('SYSTEM_CONFIG_UNIT_PATH',                    pkgsysconfdir + '/system')
+conf.set_quoted('SYSTEM_CONFIG_UNIT_PATH',                    join_paths(pkgsysconfdir, 'system'))
 conf.set_quoted('SYSTEM_DATA_UNIT_PATH',                      systemunitdir)
 conf.set_quoted('SYSTEM_SYSVINIT_PATH',                       sysvinit_path)
 conf.set_quoted('SYSTEM_SYSVRCND_PATH',                       sysvrcnd_path)
-conf.set_quoted('USER_CONFIG_UNIT_PATH',                      pkgsysconfdir + '/user')
+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_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'))
-conf.set_quoted('CATALOG_DATABASE',                           catalogstatedir + '/database')
-conf.set_quoted('SYSTEMD_CGROUP_AGENT_PATH',                  rootlibexecdir + '/systemd-cgroups-agent')
-conf.set_quoted('SYSTEMD_BINARY_PATH',                        rootlibexecdir + '/systemd')
-conf.set_quoted('SYSTEMD_FSCK_PATH',                          rootlibexecdir + '/systemd-fsck')
-conf.set_quoted('SYSTEMD_SHUTDOWN_BINARY_PATH',               rootlibexecdir + '/systemd-shutdown')
-conf.set_quoted('SYSTEMD_SLEEP_BINARY_PATH',                  rootlibexecdir + '/systemd-sleep')
-conf.set_quoted('SYSTEMCTL_BINARY_PATH',                      rootbindir + '/systemctl')
-conf.set_quoted('SYSTEMD_TTY_ASK_PASSWORD_AGENT_BINARY_PATH', rootbindir + '/systemd-tty-ask-password-agent')
-conf.set_quoted('SYSTEMD_STDIO_BRIDGE_BINARY_PATH',           bindir + '/systemd-stdio-bridge')
+conf.set_quoted('CATALOG_DATABASE',                           join_paths(catalogstatedir, 'database'))
+conf.set_quoted('SYSTEMD_CGROUP_AGENT_PATH',                  join_paths(rootlibexecdir, 'systemd-cgroups-agent'))
+conf.set_quoted('SYSTEMD_BINARY_PATH',                        join_paths(rootlibexecdir, 'systemd'))
+conf.set_quoted('SYSTEMD_FSCK_PATH',                          join_paths(rootlibexecdir, 'systemd-fsck'))
+conf.set_quoted('SYSTEMD_SHUTDOWN_BINARY_PATH',               join_paths(rootlibexecdir, 'systemd-shutdown'))
+conf.set_quoted('SYSTEMD_SLEEP_BINARY_PATH',                  join_paths(rootlibexecdir, 'systemd-sleep'))
+conf.set_quoted('SYSTEMCTL_BINARY_PATH',                      join_paths(rootbindir, 'systemctl'))
+conf.set_quoted('SYSTEMD_TTY_ASK_PASSWORD_AGENT_BINARY_PATH', join_paths(rootbindir, 'systemd-tty-ask-password-agent'))
+conf.set_quoted('SYSTEMD_STDIO_BRIDGE_BINARY_PATH',           join_paths(bindir, 'systemd-stdio-bridge'))
 conf.set_quoted('ROOTPREFIX',                                 rootprefixdir)
-conf.set_quoted('RANDOM_SEED_DIR',                            localstatedir + '/lib/systemd/')
-conf.set_quoted('RANDOM_SEED',                                localstatedir + '/lib/systemd/random-seed')
-conf.set_quoted('SYSTEMD_CRYPTSETUP_PATH',                    rootlibexecdir + '/systemd-cryptsetup')
+conf.set_quoted('RANDOM_SEED_DIR',                            randomseeddir)
+conf.set_quoted('RANDOM_SEED',                                join_paths(randomseeddir, 'random-seed'))
+conf.set_quoted('SYSTEMD_CRYPTSETUP_PATH',                    join_paths(rootlibexecdir, 'systemd-cryptsetup'))
 conf.set_quoted('SYSTEM_GENERATOR_PATH',                      systemgeneratordir)
 conf.set_quoted('USER_GENERATOR_PATH',                        usergeneratordir)
 conf.set_quoted('SYSTEM_ENV_GENERATOR_PATH',                  systemenvgeneratordir)
 conf.set_quoted('USER_ENV_GENERATOR_PATH',                    userenvgeneratordir)
 conf.set_quoted('SYSTEM_SHUTDOWN_PATH',                       systemshutdowndir)
 conf.set_quoted('SYSTEM_SLEEP_PATH',                          systemsleepdir)
-conf.set_quoted('SYSTEMD_KBD_MODEL_MAP',                      pkgdatadir + '/kbd-model-map')
-conf.set_quoted('SYSTEMD_LANGUAGE_FALLBACK_MAP',              pkgdatadir + '/language-fallback-map')
+conf.set_quoted('SYSTEMD_KBD_MODEL_MAP',                      join_paths(pkgdatadir, 'kbd-model-map'))
+conf.set_quoted('SYSTEMD_LANGUAGE_FALLBACK_MAP',              join_paths(pkgdatadir, 'language-fallback-map'))
 conf.set_quoted('UDEVLIBEXECDIR',                             udevlibexecdir)
-conf.set_quoted('POLKIT_AGENT_BINARY_PATH',                   bindir + '/pkttyagent')
+conf.set_quoted('POLKIT_AGENT_BINARY_PATH',                   join_paths(bindir, 'pkttyagent'))
 conf.set_quoted('LIBDIR',                                     libdir)
 conf.set_quoted('ROOTLIBDIR',                                 rootlibdir)
 conf.set_quoted('ROOTLIBEXECDIR',                             rootlibexecdir)
 conf.set_quoted('BOOTLIBDIR',                                 bootlibdir)
-conf.set_quoted('SYSTEMD_PULL_PATH',                          rootlibexecdir + '/systemd-pull')
-conf.set_quoted('SYSTEMD_IMPORT_PATH',                        rootlibexecdir + '/systemd-import')
-conf.set_quoted('SYSTEMD_EXPORT_PATH',                        rootlibexecdir + '/systemd-export')
-conf.set_quoted('VENDOR_KEYRING_PATH',                        rootlibexecdir + '/import-pubring.gpg')
-conf.set_quoted('USER_KEYRING_PATH',                          pkgsysconfdir + '/import-pubring.gpg')
-conf.set_quoted('DOCUMENT_ROOT',                              pkgdatadir + '/gatewayd')
+conf.set_quoted('SYSTEMD_PULL_PATH',                          join_paths(rootlibexecdir, 'systemd-pull'))
+conf.set_quoted('SYSTEMD_IMPORT_PATH',                        join_paths(rootlibexecdir, 'systemd-import'))
+conf.set_quoted('SYSTEMD_EXPORT_PATH',                        join_paths(rootlibexecdir, 'systemd-export'))
+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_quoted('ABS_BUILD_DIR',                              meson.build_root())
 conf.set_quoted('ABS_SRC_DIR',                                meson.source_root())
 
 substs.set('prefix',                                          prefixdir)
+substs.set('exec_prefix',                                     prefixdir)
+substs.set('libdir',                                          libdir)
+substs.set('rootlibdir',                                      rootlibdir)
+substs.set('includedir',                                      includedir)
 substs.set('pkgsysconfdir',                                   pkgsysconfdir)
+substs.set('bindir',                                          bindir)
+substs.set('rootbindir',                                      rootbindir)
 substs.set('rootlibexecdir',                                  rootlibexecdir)
 substs.set('systemunitdir',                                   systemunitdir)
 substs.set('userunitdir',                                     userunitdir)
@@ -187,6 +196,7 @@ substs.set('systempresetdir',                                 systempresetdir)
 substs.set('userpresetdir',                                   userpresetdir)
 substs.set('udevhwdbdir',                                     udevhwdbdir)
 substs.set('udevrulesdir',                                    udevrulesdir)
+substs.set('udevlibexecdir',                                  udevlibexecdir)
 substs.set('catalogdir',                                      catalogdir)
 substs.set('tmpfilesdir',                                     tmpfilesdir)
 substs.set('sysusersdir',                                     sysusersdir)
@@ -199,12 +209,20 @@ substs.set('systemenvgeneratordir',                           systemenvgenerator
 substs.set('userenvgeneratordir',                             userenvgeneratordir)
 substs.set('systemshutdowndir',                               systemshutdowndir)
 substs.set('systemsleepdir',                                  systemsleepdir)
-substs.set('SYSTEMCTL',                                       rootbindir + '/systemctl')
+substs.set('VARLOGDIR',                                       varlogdir)
+substs.set('CERTIFICATEROOT',                                 get_option('certificate-root'))
+substs.set('SYSTEMCTL',                                       join_paths(rootbindir, 'systemctl'))
+substs.set('RANDOM_SEED',                                     join_paths(randomseeddir, 'random-seed'))
+substs.set('SYSTEM_SYSVINIT_PATH',                            sysvinit_path)
+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'))
 
 #####################################################################
 
 cc = meson.get_compiler('c')
 pkgconfig = import('pkgconfig')
+check_compilation_sh = find_program('tools/meson-check-compilation.sh')
 
 foreach arg : ['-Wundef',
                '-Wlogical-op',
@@ -245,9 +263,9 @@ foreach arg : ['-Wundef',
                '-fPIE',
                '--param=ssp-buffer-size=4',
               ]
-  if cc.has_argument(arg)
-    add_project_arguments(arg, language : 'c')
-  endif
+        if cc.has_argument(arg)
+                add_project_arguments(arg, language : 'c')
+        endif
 endforeach
 
 if cc.compiles('
@@ -259,21 +277,23 @@ if cc.compiles('
            struct timespec now;
            return 0;
    }
-')
-  # TODO: message?
-  add_project_arguments('-Werror=shadow', language : 'c')
+', name : '-Werror=shadow with local shadowing')
+        add_project_arguments('-Werror=shadow', language : 'c')
 endif
 
 if cc.get_id() == 'clang'
-  foreach arg : ['-Wno-typedef-redefinition',
-                 '-Wno-gnu-variable-sized-type-not-at-end',
-                ]
-    if cc.has_argument(arg)
-      add_project_arguments(arg, language : 'c')
-    endif
-  endforeach
+        foreach arg : ['-Wno-typedef-redefinition',
+                       '-Wno-gnu-variable-sized-type-not-at-end',
+                      ]
+                if cc.has_argument(arg,
+                                   name : '@0@ is supported'.format(arg))
+                        add_project_arguments(arg, language : 'c')
+                endif
+        endforeach
 endif
 
+link_test_c = files('tools/meson-link-test.c')
+
 # --as-needed and --no-undefined are provided by meson by default,
 # run mesonconf to see what is enabled
 foreach arg : ['-Wl,-z,relro',
@@ -281,11 +301,38 @@ foreach arg : ['-Wl,-z,relro',
                '-pie',
                '-Wl,-fuse-ld=gold',
               ]
-  if cc.has_argument(arg)
-    add_project_link_arguments(arg, language : 'c')
-  endif
+
+        have = run_command(check_compilation_sh,
+                           cc.cmd_array(), '-x', 'c', arg,
+                           '-include', link_test_c).returncode() == 0
+        message('Linking with @0@ supported: @1@'.format(arg, have ? 'yes' : 'no'))
+        if have
+                add_project_link_arguments(arg, language : 'c')
+        endif
 endforeach
 
+if get_option('buildtype') != 'debug'
+        foreach arg : ['-ffunction-sections',
+                       '-fdata-sections']
+                if cc.has_argument(arg,
+                                   name : '@0@ is supported'.format(arg))
+                        add_project_arguments(arg, language : 'c')
+                endif
+        endforeach
+
+        foreach arg : ['-Wl,--gc-sections']
+                have = run_command(check_compilation_sh,
+                                   cc.cmd_array(), '-x', 'c', arg,
+                                   '-include', link_test_c).returncode() == 0
+                message('Linking with @0@ supported: @1@'.format(arg, have ? 'yes' : 'no'))
+                if have
+                        add_project_link_arguments(arg, language : 'c')
+                endif
+        endforeach
+endif
+
+cpp = ' '.join(cc.cmd_array()) + ' -E'
+
 #####################################################################
 # compilation result tests
 
@@ -311,10 +358,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
+        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
 endforeach
 
 foreach decl : [['IFLA_INET6_ADDR_GEN_MODE',         'linux/if_link.h'],
@@ -327,6 +374,7 @@ foreach decl : [['IFLA_INET6_ADDR_GEN_MODE',         'linux/if_link.h'],
                 ['IFLA_VLAN_PROTOCOL',               'linux/if_link.h'],
                 ['IFLA_VXLAN_REMCSUM_NOPARTIAL',     'linux/if_link.h'],
                 ['IFLA_VXLAN_GPE',                   'linux/if_link.h'],
+                ['IFLA_GENEVE_LABEL',                'linux/if_link.h'],
                 # if_tunnel.h is buggy and cannot be included on its own
                 ['IFLA_VTI_REMOTE',                  'linux/if_tunnel.h', '#include <net/if.h>'],
                 ['IFLA_IPTUN_ENCAP_DPORT',           'linux/if_tunnel.h', '#include <net/if.h>'],
@@ -339,55 +387,64 @@ foreach decl : [['IFLA_INET6_ADDR_GEN_MODE',         'linux/if_link.h'],
                 ['IFA_FLAGS',                        'linux/if_addr.h'],
                 ['LO_FLAGS_PARTSCAN',                'linux/loop.h'],
                ]
-  prefix = decl.length() > 2 ? decl[2] : ''
-  have = cc.has_header_symbol(decl[1], decl[0], prefix : prefix)
-  conf.set10('HAVE_DECL_' + decl[0], have)
+        prefix = decl.length() > 2 ? decl[2] : ''
+        have = cc.has_header_symbol(decl[1], decl[0], prefix : prefix)
+        conf.set10('HAVE_DECL_' + decl[0], have)
 endforeach
 
 skip = false
 foreach ident : ['secure_getenv', '__secure_getenv']
-  if not skip and cc.has_function(ident)
-    conf.set('HAVE_' + ident.to_upper(), 1)
-    skip = true
-  endif
+        if not skip and cc.has_function(ident)
+                conf.set('HAVE_' + ident.to_upper(), 1)
+                skip = true
+        endif
 endforeach
 
 foreach ident : [
-  ['memfd_create',      '''#include <sys/memfd.h>'''],
-  ['gettid',            '''#include <sys/types.h>'''],
-  ['pivot_root',        '''#include <stdlib.h>'''],        # no known header declares pivot_root
-  ['name_to_handle_at', '''#define _GNU_SOURCE
-                           #include <sys/types.h>
-                           #include <sys/stat.h>
-                           #include <fcntl.h>'''],
-  ['setns',             '''#define _GNU_SOURCE
-                           #include <sched.h>'''],
-  ['getrandom',         '''#include <sys/random.h>'''],
-  ['renameat2',         '''#include <stdio.h>'''],
-  ['kcmp',              '''#include <linux/kcmp.h>'''],
-  ['keyctl',            '''#include <sys/types.h>
-                           #include <keyutils.h>'''],
-  ['copy_file_range',   '''#include <sys/syscall.h>
-                           #include <unistd.h>'''],
-  ['explicit_bzero' ,   '''#include <strings.h>'''],
-  ]
-
-  have = cc.has_function(ident[0], prefix : ident[1])
-  conf.set10('HAVE_DECL_' + ident[0].to_upper(), have)
+        ['memfd_create',      '''#include <sys/memfd.h>'''],
+        ['gettid',            '''#include <sys/types.h>'''],
+        ['pivot_root',        '''#include <stdlib.h>'''],     # no known header declares pivot_root
+        ['name_to_handle_at', '''#define _GNU_SOURCE
+                                 #include <sys/types.h>
+                                 #include <sys/stat.h>
+                                 #include <fcntl.h>'''],
+        ['setns',             '''#define _GNU_SOURCE
+                                 #include <sched.h>'''],
+        ['renameat2',         '''#include <stdio.h>'''],
+        ['kcmp',              '''#include <linux/kcmp.h>'''],
+        ['keyctl',            '''#include <sys/types.h>
+                                 #include <keyutils.h>'''],
+        ['copy_file_range',   '''#include <sys/syscall.h>
+                                 #include <unistd.h>'''],
+        ['explicit_bzero' ,   '''#include <string.h>'''],
+]
+
+        have = cc.has_function(ident[0], prefix : ident[1])
+        conf.set10('HAVE_DECL_' + ident[0].to_upper(), have)
 endforeach
 
+if cc.has_function('getrandom', prefix : '''#include <sys/random.h>''')
+        conf.set('USE_SYS_RANDOM_H', 1)
+        conf.set10('HAVE_DECL_GETRANDOM', 1)
+else
+        have = cc.has_function('getrandom', prefix : '''#include <linux/random.h>''')
+        conf.set10('HAVE_DECL_GETRANDOM', have)
+endif
+
 #####################################################################
 
 sed = find_program('sed')
 grep = find_program('grep')
 awk = find_program('awk')
-m4 = find_program('/usr/bin/m4')
+m4 = find_program('m4')
 stat = find_program('stat')
 git = find_program('git', required : false)
 etags = find_program('etags', required : false)
 
 meson_make_symlink = meson.source_root() + '/tools/meson-make-symlink.sh'
 mkdir_p = 'mkdir -p $DESTDIR/@0@'
+test_efi_create_disk_sh = find_program('test/test-efi-create-disk.sh')
+splash_bmp = files('test/splash.bmp')
 
 # if -Dxxx-path option is found, use that. Otherwise, check in $PATH,
 # /usr/sbin, /sbin, and fall back to the default from middle column.
@@ -404,20 +461,24 @@ progs = [['telinit',    '/lib/sysvinit/telinit'],
          ['setfont',    '/usr/bin/setfont',    'KBD_SETFONT'],
         ]
 foreach prog : progs
-  path = get_option(prog[0] + '-path')
-  if path != ''
-    message('Using @1@ for @0@'.format(prog[0], path))
-  else
-    exe = find_program(prog[0], '/usr/sbin/' + prog[0], '/sbin/' + prog[0], required: false)
-    path = exe.found() ? exe.path() : prog[1]
-  endif
-  name = prog.length() > 2 ? prog[2] : prog[0].to_upper()
-  conf.set_quoted(name, path)
-  substs.set(name, path)
+        path = get_option(prog[0] + '-path')
+        if path != ''
+                message('Using @1@ for @0@'.format(prog[0], path))
+        else
+                exe = find_program(prog[0],
+                                   '/usr/sbin/' + prog[0],
+                                   '/sbin/' + prog[0],
+                                   required: false)
+                path = exe.found() ? exe.path() : prog[1]
+        endif
+        name = prog.length() > 2 ? prog[2] : prog[0].to_upper()
+        conf.set_quoted(name, path)
+        substs.set(name, path)
 endforeach
 
-# TODO: add ln --relative check
-# AS_IF([! ln --relative --help > /dev/null 2>&1], [AC_MSG_ERROR([*** ln doesn't support --relative ***])])
+if run_command('ln', '--relative', '--help').returncode() != 0
+        error('ln does not support --relative')
+endif
 
 ############################################################
 
@@ -432,22 +493,23 @@ gperf_snippet_format = 'echo foo,bar | @0@ -L ANSI-C'
 gperf_snippet = run_command('sh', '-c', gperf_snippet_format.format(gperf.path()))
 gperf_test = gperf_test_format.format('size_t', gperf_snippet.stdout())
 if cc.compiles(gperf_test)
-  gperf_len_type = 'size_t'
+        gperf_len_type = 'size_t'
 else
-  gperf_test = gperf_test_format.format('unsigned', gperf_snippet.stdout())
-  if cc.compiles(gperf_test)
-    gperf_len_type = 'unsigned'
-  else
-    error('unable to determine gperf len type')
-  endif
+        gperf_test = gperf_test_format.format('unsigned', gperf_snippet.stdout())
+        if cc.compiles(gperf_test)
+                gperf_len_type = 'unsigned'
+        else
+                error('unable to determine gperf len type')
+        endif
 endif
 message('gperf len type is @0@'.format(gperf_len_type))
-conf.set('GPERF_LEN_TYPE', gperf_len_type, description : 'The type of gperf "len" parameter')
+conf.set('GPERF_LEN_TYPE', gperf_len_type,
+         description : 'The type of gperf "len" parameter')
 
 ############################################################
 
 if not cc.has_header('sys/capability.h')
-  error('POSIX caps headers not found')
+        error('POSIX caps headers not found')
 endif
 foreach header : ['linux/btrfs.h',
                   'linux/memfd.h',
@@ -455,9 +517,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
+        if cc.has_header(header)
+                conf.set('HAVE_' + header.underscorify().to_upper(), 1)
+        endif
 endforeach
 
 ############################################################
@@ -468,74 +530,82 @@ default_hierarchy = get_option('default-hierarchy')
 conf.set_quoted('DEFAULT_HIERARCHY_NAME', default_hierarchy,
                 description : 'default cgroup hierarchy as string')
 if default_hierarchy == 'legacy'
-  conf.set('DEFAULT_HIERARCHY', 'CGROUP_UNIFIED_NONE')
+        conf.set('DEFAULT_HIERARCHY', 'CGROUP_UNIFIED_NONE')
 elif default_hierarchy == 'hybrid'
-  conf.set('DEFAULT_HIERARCHY', 'CGROUP_UNIFIED_SYSTEMD')
+        conf.set('DEFAULT_HIERARCHY', 'CGROUP_UNIFIED_SYSTEMD')
 else
-  conf.set('DEFAULT_HIERARCHY', 'CGROUP_UNIFIED_ALL')
+        conf.set('DEFAULT_HIERARCHY', 'CGROUP_UNIFIED_ALL')
 endif
 
 time_epoch = get_option('time-epoch')
 if time_epoch == ''
-  NEWS = files('NEWS')
-  time_epoch = run_command(stat, '-c', '%Y', NEWS).stdout()
+        NEWS = files('NEWS')
+        time_epoch = run_command(stat, '-c', '%Y', NEWS).stdout()
 endif
 time_epoch = time_epoch.to_int()
 conf.set('TIME_EPOCH', time_epoch)
 
 system_uid_max = get_option('system-uid-max')
 if system_uid_max == ''
-  system_uid_max = run_command(
-      awk,
-      'BEGIN { uid=999 } /^\s*SYS_UID_MAX\s+/ { uid=$2 } END { print uid }',
-      '/etc/login.defs').stdout()
+        system_uid_max = run_command(
+                awk,
+                'BEGIN { uid=999 } /^\s*SYS_UID_MAX\s+/ { uid=$2 } END { print uid }',
+                '/etc/login.defs').stdout()
 endif
 system_uid_max = system_uid_max.to_int()
 conf.set('SYSTEM_UID_MAX', system_uid_max)
 substs.set('systemuidmax', system_uid_max)
-message('Maximum system UID is @0@'.format(system_uid_max))
+message('maximum system UID is @0@'.format(system_uid_max))
 
 conf.set_quoted('NOBODY_USER_NAME', get_option('nobody-user'))
 conf.set_quoted('NOBODY_GROUP_NAME', get_option('nobody-group'))
 
 system_gid_max = get_option('system-gid-max')
 if system_gid_max == ''
-  system_gid_max = run_command(
-      awk,
-      'BEGIN { gid=999 } /^\s*SYS_GID_MAX\s+/ { gid=$2 } END { print gid }',
-      '/etc/login.defs').stdout()
+        system_gid_max = run_command(
+                awk,
+                'BEGIN { gid=999 } /^\s*SYS_GID_MAX\s+/ { gid=$2 } END { print gid }',
+                '/etc/login.defs').stdout()
 endif
 system_gid_max = system_gid_max.to_int()
 conf.set('SYSTEM_GID_MAX', system_gid_max)
 substs.set('systemgidmax', system_gid_max)
-message('Maximum system GID is @0@'.format(system_gid_max))
+message('maximum system GID is @0@'.format(system_gid_max))
 
 tty_gid = get_option('tty-gid')
 conf.set('TTY_GID', tty_gid)
-m4_defines += ['-DTTY_GID=' + tty_gid]
+substs.set('TTY_GID', tty_gid)
 
 if get_option('adm-group')
-  m4_defines += ['-DENABLE_ADM_GROUP']
+        m4_defines += ['-DENABLE_ADM_GROUP']
 endif
 
 if get_option('wheel-group')
-  m4_defines += ['-DENABLE_WHEEL_GROUP']
+        m4_defines += ['-DENABLE_WHEEL_GROUP']
 endif
 
 substs.set('DEV_KVM_MODE', get_option('dev-kvm-mode'))
 
-conf.set10('KILL_USER_PROCESSES', get_option('default-kill-user-processes'))
+kill_user_processes = get_option('default-kill-user-processes')
+conf.set10('KILL_USER_PROCESSES', kill_user_processes)
+substs.set('KILL_USER_PROCESSES', kill_user_processes ? 'yes' : 'no')
 
 default_dnssec = get_option('default-dnssec')
 conf.set('DEFAULT_DNSSEC_MODE',
          'DNSSEC_' + default_dnssec.underscorify().to_upper())
+substs.set('DEFAULT_DNSSEC_MODE', default_dnssec)
 
 conf.set_quoted('DNS_SERVERS', get_option('dns-servers'))
+substs.set('DNS_SERVERS', get_option('dns-servers'))
 
 conf.set_quoted('NTP_SERVERS', get_option('ntp-servers'))
+substs.set('NTP_SERVERS', get_option('ntp-servers'))
 
 conf.set_quoted('GETTEXT_PACKAGE', meson.project_name())
 
+substs.set('SUSHELL', get_option('debug-shell'))
+substs.set('DEBUGTTY', get_option('debug-tty'))
+
 #####################################################################
 
 threads = dependency('threads')
@@ -544,325 +614,357 @@ libm = cc.find_library('m')
 libdl = cc.find_library('dl')
 libcrypt = cc.find_library('crypt')
 
-libcap = dependency('libcap')
+libcap = dependency('libcap', required : false)
+if not libcap.found()
+        # Compat with Ubuntu 14.04 which ships libcap w/o .pc file
+        libcap = cc.find_library('cap')
+endif
+
 libmount = dependency('mount',
                       version : '>= 2.27')
 
 want_seccomp = get_option('seccomp')
-if want_seccomp != 'no'
-  libseccomp = dependency('libseccomp',
-                          required : want_seccomp == 'yes')
-  if libseccomp.found()
-    conf.set('HAVE_SECCOMP', 1)
-    m4_defines += ['-DHAVE_SECCOMP']
-  endif
+if want_seccomp != 'false'
+        libseccomp = dependency('libseccomp',
+                                required : want_seccomp == 'true')
+        if libseccomp.found()
+                conf.set('HAVE_SECCOMP', 1)
+                m4_defines += ['-DHAVE_SECCOMP']
+        endif
 else
-  libseccomp = []
+        libseccomp = []
 endif
 
 want_selinux = get_option('selinux')
-if want_selinux != 'no'
-  libselinux = dependency('libselinux',
-                          version : '>= 2.1.9',
-                          required : want_selinux == 'yes')
-  if libselinux.found()
-    conf.set('HAVE_SELINUX', 1)
-    m4_defines += ['-DHAVE_SELINUX']
-  endif
+if want_selinux != 'false'
+        libselinux = dependency('libselinux',
+                                version : '>= 2.1.9',
+                                required : want_selinux == 'true')
+        if libselinux.found()
+                conf.set('HAVE_SELINUX', 1)
+                m4_defines += ['-DHAVE_SELINUX']
+        endif
 else
-  libselinux = []
+        libselinux = []
 endif
 
 want_apparmor = get_option('apparmor')
-if want_apparmor != 'no'
-  libapparmor = dependency('libapparmor',
-                           required : want_apparmor == 'yes')
-  if libapparmor.found()
-    conf.set('HAVE_APPARMOR', 1)
-    m4_defines += ['-DHAVE_APPARMOR']
-  endif
-else
-  libapparmor = []
-endif
-
-want_smack = get_option('smack')
-if want_smack != 'no'
-  libsmack = dependency('libsmack',
-                        required : want_smack == 'yes')
-  if libsmack.found()
-    conf.set('HAVE_SMACK', 1)
-    m4_defines += ['-DHAVE_SMACK']
-  endif
+if want_apparmor != 'false'
+        libapparmor = dependency('libapparmor',
+                                 required : want_apparmor == 'true')
+        if libapparmor.found()
+                conf.set('HAVE_APPARMOR', 1)
+                m4_defines += ['-DHAVE_APPARMOR']
+        endif
 else
-  libsmack = []
+        libapparmor = []
 endif
 
 smack_run_label = get_option('smack-run-label')
 if smack_run_label != ''
-  conf.set_quoted('SMACK_RUN_LABEL', smack_run_label)
-  m4_defines += ['-DHAVE_SMACK_RUN_LABEL']
+        conf.set_quoted('SMACK_RUN_LABEL', smack_run_label)
+        m4_defines += ['-DHAVE_SMACK_RUN_LABEL']
+endif
+
+want_polkit = get_option('polkit')
+install_polkit = false
+install_polkit_pkla = false
+if want_polkit != 'false'
+        conf.set('ENABLE_POLKIT', 1)
+        install_polkit = true
+
+        libpolkit = dependency('polkit-gobject-1',
+                               required : false)
+        if libpolkit.found() and libpolkit.version().version_compare('< 0.106')
+                message('Old polkit detected, will install pkla files')
+                install_polkit_pkla = true
+        endif
+endif
+
+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)
+                m4_defines += ['-DHAVE_ACL']
+        endif
+else
+        libacl = []
 endif
 
 want_audit = get_option('audit')
-if want_audit != 'no'
-  libaudit = dependency('audit', required : want_audit == 'yes')
-  if libaudit.found()
-    conf.set('HAVE_AUDIT', 1)
-  endif
+if want_audit != 'false'
+        libaudit = dependency('audit', required : want_audit == 'true')
+        if libaudit.found()
+                conf.set('HAVE_AUDIT', 1)
+        endif
 else
-  libaudit = []
+        libaudit = []
 endif
 
 want_blkid = get_option('blkid')
-if want_blkid != 'no'
-  libblkid = dependency('blkid', required : want_blkid == 'yes')
-  if libblkid.found()
-    conf.set('HAVE_BLKID', 1)
-  endif
+if want_blkid != 'false'
+        libblkid = dependency('blkid', required : want_blkid == 'true')
+        if libblkid.found()
+                conf.set('HAVE_BLKID', 1)
+        endif
 else
-  libblkid = []
+        libblkid = []
 endif
 
 want_kmod = get_option('kmod')
-if want_kmod != 'no'
-  libkmod = dependency('libkmod',
-                       version : '>= 15',
-                       required : want_kmod == 'yes')
-  if libkmod.found()
-    conf.set('HAVE_KMOD', 1)
-  endif
+if want_kmod != 'false'
+        libkmod = dependency('libkmod',
+                             version : '>= 15',
+                             required : want_kmod == 'true')
+        if libkmod.found()
+                conf.set('HAVE_KMOD', 1)
+        endif
 else
-  libkmod = []
+        libkmod = []
 endif
 
 want_pam = get_option('pam')
-if want_pam != 'no'
-  libpam = cc.find_library('pam', required : want_pam == 'yes')
-  libpam_misc = cc.find_library('pam_misc', required : want_pam == 'yes')
-  if libpam.found() and libpam_misc.found()
-    conf.set('HAVE_PAM', 1)
-    m4_defines += ['-DHAVE_PAM']
-  endif
+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)
+                m4_defines += ['-DHAVE_PAM']
+        endif
 else
-  libpam = []
-  libpam_misc = []
+        libpam = []
+        libpam_misc = []
 endif
 
 want_microhttpd = get_option('microhttpd')
-if want_microhttpd != 'no'
-  libmicrohttpd = dependency('libmicrohttpd',
-                             version : '>= 0.9.33',
-                             required : want_microhttpd == 'yes')
-  if libmicrohttpd.found()
-    conf.set('HAVE_MICROHTTPD', 1)
-    m4_defines += ['-DHAVE_MICROHTTPD']
-  endif
+if want_microhttpd != 'false'
+        libmicrohttpd = dependency('libmicrohttpd',
+                                   version : '>= 0.9.33',
+                                   required : want_microhttpd == 'true')
+        if libmicrohttpd.found()
+                conf.set('HAVE_MICROHTTPD', 1)
+                m4_defines += ['-DHAVE_MICROHTTPD']
+        endif
 else
-  libmicrohttpd = []
+        libmicrohttpd = []
 endif
 
 want_libcryptsetup = get_option('libcryptsetup')
-if want_libcryptsetup != 'no'
-  libcryptsetup = dependency('libcryptsetup',
-                             version : '>= 1.6.0',
-                             required : want_libcryptsetup == 'yes')
-  if libcryptsetup.found()
-    conf.set('HAVE_LIBCRYPTSETUP', 1)
-  endif
+if want_libcryptsetup != 'false'
+        libcryptsetup = dependency('libcryptsetup',
+                                   version : '>= 1.6.0',
+                                   required : want_libcryptsetup == 'true')
+        if libcryptsetup.found()
+                conf.set('HAVE_LIBCRYPTSETUP', 1)
+        endif
 else
-  libcryptsetup = []
+        libcryptsetup = []
 endif
 
 want_libcurl = get_option('libcurl')
-if want_libcurl != 'no'
-  libcurl = dependency('libcurl',
-                       version : '>= 7.32.0',
-                       required : want_libcurl == 'yes')
-  if libcurl.found()
-    conf.set('HAVE_LIBCURL', 1)
-    m4_defines += ['-DHAVE_LIBCURL']
-  endif
+if want_libcurl != 'false'
+        libcurl = dependency('libcurl',
+                             version : '>= 7.32.0',
+                             required : want_libcurl == 'true')
+        if libcurl.found()
+                conf.set('HAVE_LIBCURL', 1)
+                m4_defines += ['-DHAVE_LIBCURL']
+        endif
 else
-  libcurl = []
+        libcurl = []
 endif
 
 want_libidn = get_option('libidn')
-if want_libidn != 'no'
-  libidn = dependency('libidn',
-                      required : want_libidn == 'yes')
-  if libidn.found()
-    conf.set('HAVE_LIBIDN', 1)
-    m4_defines += ['-DHAVE_LIBIDN']
-  endif
+if want_libidn != 'false'
+        libidn = dependency('libidn',
+                            required : want_libidn == 'true')
+        if libidn.found()
+                conf.set('HAVE_LIBIDN', 1)
+                m4_defines += ['-DHAVE_LIBIDN']
+        endif
 else
-  libidn = []
+        libidn = []
 endif
 
 want_libiptc = get_option('libiptc')
-if want_libiptc != 'no'
-  libiptc = dependency('libiptc',
-                       required : want_libiptc == 'yes')
-  if libiptc.found()
-    conf.set('HAVE_LIBIPTC', 1)
-    m4_defines += ['-DHAVE_LIBIPTC']
-  endif
+if want_libiptc != 'false'
+        libiptc = dependency('libiptc',
+                             required : want_libiptc == 'true')
+        if libiptc.found()
+                conf.set('HAVE_LIBIPTC', 1)
+                m4_defines += ['-DHAVE_LIBIPTC']
+        endif
 else
-  libiptc = []
+        libiptc = []
 endif
 
 want_qrencode = get_option('qrencode')
-if want_qrencode != 'no'
-  libqrencode = dependency('libqrencode',
-                           required : want_qrencode == 'yes')
-  if libqrencode.found()
-    conf.set('HAVE_QRENCODE', 1)
-  endif
+if want_qrencode != 'false'
+        libqrencode = dependency('libqrencode',
+                                 required : want_qrencode == 'true')
+        if libqrencode.found()
+                conf.set('HAVE_QRENCODE', 1)
+        endif
 else
-  libqrencode = []
+        libqrencode = []
 endif
 
 want_gnutls = get_option('gnutls')
-if want_gnutls != 'no'
-  libgnutls = dependency('gnutls',
-                         version : '>= 3.1.4',
-                         required : want_gnutls == 'yes')
-  if libgnutls.found()
-    conf.set('HAVE_GNUTLS', 1)
-  endif
+if want_gnutls != 'false'
+        libgnutls = dependency('gnutls',
+                               version : '>= 3.1.4',
+                               required : want_gnutls == 'true')
+        if libgnutls.found()
+                conf.set('HAVE_GNUTLS', 1)
+        endif
 else
-  libgnutls = []
+        libgnutls = []
 endif
 
 want_elfutils = get_option('elfutils')
-if want_elfutils != 'no'
-  libdw = dependency('libdw',
-                     required : want_elfutils == 'yes')
-  if libdw.found()
-    conf.set('HAVE_ELFUTILS', 1)
-  endif
+if want_elfutils != 'false'
+        libdw = dependency('libdw',
+                           required : want_elfutils == 'true')
+        if libdw.found()
+                conf.set('HAVE_ELFUTILS', 1)
+        endif
 else
-  libdw = []
+        libdw = []
 endif
 
 want_zlib = get_option('zlib')
-if want_zlib != 'no'
-  libz = dependency('zlib',
-                    required : want_zlib == 'yes')
-  if libz.found()
-    conf.set('HAVE_ZLIB', 1)
-  endif
+if want_zlib != 'false'
+        libz = dependency('zlib',
+                          required : want_zlib == 'true')
+        if libz.found()
+                conf.set('HAVE_ZLIB', 1)
+        endif
 else
-  libz = []
+        libz = []
 endif
 
 want_bzip2 = get_option('bzip2')
-if want_bzip2 != 'no'
-  libbzip2 = cc.find_library('bz2',
-                             required : want_bzip2 == 'yes')
-  if libbzip2.found()
-    conf.set('HAVE_BZIP2', 1)
-  endif
+if want_bzip2 != 'false'
+        libbzip2 = cc.find_library('bz2',
+                                   required : want_bzip2 == 'true')
+        if libbzip2.found()
+                conf.set('HAVE_BZIP2', 1)
+        endif
 else
-  libbzip2 = []
+        libbzip2 = []
 endif
 
 want_xz = get_option('xz')
-if want_xz != 'no'
-  libxz = dependency('liblzma',
-                     required : want_xz == 'yes')
-  if libxz.found()
-    conf.set('HAVE_XZ', 1)
-  endif
+if want_xz != 'false'
+        libxz = dependency('liblzma',
+                           required : want_xz == 'true')
+        if libxz.found()
+                conf.set('HAVE_XZ', 1)
+        endif
 else
-  libxz = []
+        libxz = []
 endif
 
 want_lz4 = get_option('lz4')
-if want_lz4 != 'no'
-  liblz4 = dependency('liblz4',
-                      required : want_lz4 == 'yes')
-  if liblz4.found()
-    conf.set('HAVE_LZ4', 1)
-  endif
+if want_lz4 != 'false'
+        liblz4 = dependency('liblz4',
+                            required : want_lz4 == 'true')
+        if liblz4.found()
+                conf.set('HAVE_LZ4', 1)
+        endif
 else
-  liblz4 = []
-endif
-
-libacl = cc.find_library('acl', required : false)
-if libacl.found()
-  conf.set('HAVE_ACL', 1)
-  m4_defines += ['-DHAVE_ACL']
+        liblz4 = []
 endif
 
 want_glib = get_option('glib')
-if want_glib != 'no'
-  libglib =    dependency('glib-2.0',
-                          version : '>= 2.22.0',
-                          required : want_glib == 'yes')
-  libgobject = dependency('gobject-2.0',
-                          version : '>= 2.22.0',
-                          required : want_glib == 'yes')
-  libgio =     dependency('gio-2.0',
-                          required : want_glib == 'yes')
-  if libglib.found() and libgobject.found() and libgio.found()
-    conf.set('HAVE_GLIB', 1)
-  endif
+if want_glib != 'false'
+        libglib =    dependency('glib-2.0',
+                                version : '>= 2.22.0',
+                                required : want_glib == 'true')
+        libgobject = dependency('gobject-2.0',
+                                version : '>= 2.22.0',
+                                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
+else
+        libglib = []
+        libgobject = []
+        libgio = []
+endif
+
+want_xkbcommon = get_option('xkbcommon')
+if want_xkbcommon != 'false'
+        libxkbcommon = dependency('xkbcommon',
+                                  version : '>= 0.3.0',
+                                  required : want_xkbcommon == 'true')
+        if libxkbcommon.found()
+                conf.set('HAVE_XKBCOMMON', 1)
+        endif
 else
-  libglib = []
-  libgobject = []
-  libgio = []
+        libxkbcommon = []
 endif
 
 want_dbus = get_option('dbus')
-if want_dbus != 'no'
-  libdbus = dependency('dbus-1',
-                       version : '>= 1.3.2',
-                       required : want_dbus == 'yes')
-  if libdbus.found()
-    conf.set('HAVE_DBUS', 1)
-  endif
+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
 else
-  libdbus = []
+        libdbus = []
 endif
 
-want_libgcrypt = get_option('libgcrypt')
-if want_libgcrypt != 'no'
-  libgcrypt = cc.find_library('gcrypt', required : want_libgcrypt == 'yes')
-  if libgcrypt.found()
-    conf.set('HAVE_LIBGCRYPT', 1)
-  endif
+want_gcrypt = get_option('gcrypt')
+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
+                # link to neither of the libs if one is not found
+                libgcrypt = []
+                libgpg_error = []
+        endif
 else
-  libgcrypt = []
+        libgcrypt = []
+        libgpg_error = []
 endif
 
 want_importd = get_option('importd')
-if want_importd != 'no'
-  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_LZ4', 0) == 1)
-  if have_deps
-    conf.set('ENABLE_IMPORTD', 1)
-  elif want_importd == 'yes'
-    error('importd support was requested, but dependencies are not available')
-  endif
+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'
+                error('importd support was requested, but dependencies are not available')
+        endif
 endif
 
 want_remote = get_option('remote')
-if want_remote != 'no'
-  have_deps = [conf.get('HAVE_MICROHTTPD', 0) == 1,
-               conf.get('HAVE_LIBCURL', 0) == 1]
-  # 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
-  # config should be installed when any of the programs are built.
-  if want_remote == 'yes' 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
+if want_remote != 'false'
+        have_deps = [conf.get('HAVE_MICROHTTPD', 0) == 1,
+                     conf.get('HAVE_LIBCURL', 0) == 1]
+        # 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
+        # config should be installed when any of the programs are built.
+        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
 endif
 
 foreach pair : [['utmp',          'HAVE_UTMP'],
@@ -889,11 +991,16 @@ foreach pair : [['utmp',          'HAVE_UTMP'],
                 ['hwdb',          'ENABLE_HWDB'],
                 ['rfkill',        'ENABLE_RFKILL'],
                 ['ldconfig',      'ENABLE_LDCONFIG'],
+                ['efi',           'ENABLE_EFI'],
+                ['tpm',           'SD_BOOT_LOG_TPM'],
+                ['ima',           'HAVE_IMA'],
+                ['smack',         'HAVE_SMACK'],
                ]
 
-  if get_option(pair[0])
-    conf.set(pair[1], 1)
-  endif
+        if get_option(pair[0])
+                conf.set(pair[1], 1)
+                m4_defines += ['-D' + pair[1]]
+        endif
 endforeach
 
 want_tests = get_option('tests')
@@ -903,26 +1010,36 @@ tests = []
 #####################################################################
 
 if get_option('efi')
-  efi_arch = host_machine.cpu_family() # TODO: check this works at all
-  if efi_arch == 'ia32'
-    EFI_MACHINE_TYPE_NAME = 'ia32'
-  elif efi_arch == 'x86_64'
-    EFI_MACHINE_TYPE_NAME = 'x64'
-  elif efi_arch == 'aarch64'
-    EFI_MACHINE_TYPE_NAME = 'x64'
-  else
-    EFI_MACHINE_TYPE_NAME = efi_arch
-  endif
-
-  conf.set('ENABLE_EFI', 1)
-  conf.set_quoted('EFI_MACHINE_TYPE_NAME', EFI_MACHINE_TYPE_NAME)
+        efi_arch = host_machine.cpu_family()
+
+        if efi_arch == 'x86'
+                EFI_MACHINE_TYPE_NAME = 'ia32'
+                gnu_efi_arch = 'ia32'
+        elif efi_arch == 'x86_64'
+                EFI_MACHINE_TYPE_NAME = 'x64'
+                gnu_efi_arch = 'x86_64'
+        elif efi_arch == 'arm'
+                EFI_MACHINE_TYPE_NAME = 'arm'
+                gnu_efi_arch = 'arm'
+        elif efi_arch == 'aarch64'
+                EFI_MACHINE_TYPE_NAME = 'aa64'
+                gnu_efi_arch = 'aarch64'
+        else
+                EFI_MACHINE_TYPE_NAME = ''
+                gnu_efi_arch = ''
+        endif
+
+        conf.set('ENABLE_EFI', 1)
+        conf.set_quoted('EFI_MACHINE_TYPE_NAME', EFI_MACHINE_TYPE_NAME)
+
+        conf.set('SD_TPM_PCR', get_option('tpm-pcrindex').to_int())
 endif
 
 #####################################################################
 
 config_h = configure_file(
-    output : 'config.h',
-    configuration : conf)
+        output : 'config.h',
+        configuration : conf)
 
 includes = include_directories('src/basic',
                                'src/shared',
@@ -958,73 +1075,36 @@ subdir('src/journal')
 subdir('src/login')
 
 libjournal_core = static_library(
-    'journal-core',
-    libjournal_core_sources,
-    journald_gperf_c,
-    include_directories : includes,
-    link_with : [libbasic,
-                 libsystemd_internal,
-                 libsystemd_journal_internal],
-    install : false)
+        'journal-core',
+        libjournal_core_sources,
+        journald_gperf_c,
+        include_directories : includes,
+        install : false)
 
 libsystemd_sym_path = '@0@/@1@'.format(meson.current_source_dir(), libsystemd_sym)
 libsystemd = shared_library(
-    'systemd',
-    libsystemd_internal_sources,
-    libsystemd_journal_internal_sources,
-    version : '0.18.0',
-    include_directories : includes,
-    link_args : ['-shared',
-                 '-Wl,--version-script=' + libsystemd_sym_path],
-    link_with : [libbasic],
-    dependencies : [threads,
-                    librt,
-                    libxz,
-                    liblz4],
-    link_depends : libsystemd_sym,
-    install : true,
-    install_dir : rootlibdir)
+        'systemd',
+        libsystemd_internal_sources,
+        journal_internal_sources,
+        version : '0.18.0',
+        include_directories : includes,
+        link_args : ['-shared',
+                     '-Wl,--version-script=' + libsystemd_sym_path],
+        link_with : [libbasic],
+        dependencies : [threads,
+                        libgcrypt,
+                        librt,
+                        libxz,
+                        liblz4],
+        link_depends : libsystemd_sym,
+        install : true,
+        install_dir : rootlibdir)
 
 ############################################################
 
-foreach tuple : [['myhostname', 'HAVE_MYHOSTNAME', []],
-                 ['systemd',     '',               []],
-                 ['mymachines', 'ENABLE_MACHINED', []],
-                 ['resolve',    'ENABLE_RESOLVED', [libdl]]]
-
-  condition = tuple[1] == '' or conf.get(tuple[1], 0) == 1
-  if condition
-    module = tuple[0]
-    extra_deps = tuple[2]
-
-    sym = 'src/nss-@0@/nss-@0@.sym'.format(module)
-    version_script_arg = join_paths(meson.current_source_dir(), sym)
-
-    shared_library(
-      'nss_' + module,
-      'src/nss-@0@/nss-@0@.c'.format(module),
-      version : '2',
-      include_directories : includes,
-      link_args : ['-shared',
-                   '-Wl,--version-script=' + version_script_arg,
-                   '-Wl,--undefined'],
-      link_with : [libsystemd_internal,
-                   libbasic],
-      dependencies : [threads,
-                      librt] + extra_deps,
-      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))
-  endif
-endforeach
-
-############################################################
+# binaries that have --help and are intended for use by humans,
+# usually, but not always, installed in /bin.
+public_programs = []
 
 subdir('src/libudev')
 subdir('src/shared')
@@ -1046,541 +1126,694 @@ subdir('src/timedate')
 subdir('src/timesync')
 subdir('src/vconsole')
 subdir('src/sulogin-shell')
+subdir('src/boot/efi')
 
 subdir('src/test')
+subdir('test')
+
+############################################################
+
+# only static linking apart from libdl, to make sure that the
+# module is linked to all libraries that it uses.
+test_dlopen = executable(
+        'test-dlopen',
+        test_dlopen_c,
+        include_directories : includes,
+        link_with : [libbasic],
+        dependencies : [libdl])
+
+foreach tuple : [['myhostname', 'HAVE_MYHOSTNAME', []],
+                 ['systemd',     '',               []],
+                 ['mymachines', 'ENABLE_MACHINED', []],
+                 ['resolve',    'ENABLE_RESOLVED', [libdl]]]
+
+        condition = tuple[1] == '' or conf.get(tuple[1], 0) == 1
+        if condition
+                module = tuple[0]
+                extra_deps = tuple[2]
+
+                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),
+                        version : '2',
+                        include_directories : includes,
+                        link_args : ['-shared',
+                                     '-Wl,--version-script=' + version_script_arg,
+                                     '-Wl,--undefined'],
+                        link_with : [libsystemd_internal,
+                                     libbasic],
+                        dependencies : [threads,
+                                        librt] + extra_deps,
+                        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
+        endif
+endforeach
+
+############################################################
 
 executable('systemd',
            systemd_sources,
            include_directories : includes,
            link_with : [libcore,
-                        libshared],
+                        libshared,
+                        libudev],
            dependencies : [threads,
                            librt,
                            libseccomp,
                            libselinux,
                            libmount,
                            libblkid],
+           install_rpath : rootlibexecdir,
            install : true,
            install_dir : rootlibexecdir)
 
-executable('systemd-analyze',
-           systemd_analyze_sources,
-           include_directories : includes,
-           link_with : [libcore,
-                        libshared],
-           dependencies : [threads,
-                           librt,
-                           libseccomp,
-                           libselinux,
-                           libmount,
-                           libblkid],
-           install : true)
+exe = executable('systemd-analyze',
+                 systemd_analyze_sources,
+                 include_directories : includes,
+                 link_with : [libcore,
+                              libudev,
+                              libshared],
+                 dependencies : [threads,
+                                 librt,
+                                 libseccomp,
+                                 libselinux,
+                                 libmount,
+                                 libblkid],
+                 install_rpath : rootlibexecdir,
+                 install : true)
+public_programs += [exe]
 
 executable('systemd-journald',
            systemd_journald_sources,
            include_directories : includes,
-           link_with : [libsystemd_journal_internal,
-                        libjournal_core,
+           link_with : [libjournal_core,
                         libshared,
                         libudev],
            dependencies : [threads,
                            libxz,
-                           liblz4],
+                           liblz4,
+                           libselinux],
+           install_rpath : rootlibexecdir,
            install : true,
            install_dir : rootlibexecdir)
 
-executable('systemd-cat',
-           systemd_cat_sources,
-           include_directories : includes,
-           link_with : [libjournal_core,
-                        libshared,
-                        libudev],
-           dependencies : [threads],
-           install : true)
-
-executable('journalctl',
-           journalctl_sources,
-           include_directories : includes,
-           link_with : [libshared,
-                        libudev],
-           dependencies : [threads,
-                           libqrencode,
-                           libxz,
-                           liblz4],
-           install : true,
-           install_dir : rootbindir)
+exe = executable('systemd-cat',
+                 systemd_cat_sources,
+                 include_directories : includes,
+                 link_with : [libjournal_core,
+                              libshared,
+                              libudev],
+                 dependencies : [threads],
+                 install_rpath : rootlibexecdir,
+                 install : true)
+public_programs += [exe]
+
+exe = executable('journalctl',
+                 journalctl_sources,
+                 include_directories : includes,
+                 link_with : [libshared,
+                              libudev],
+                 dependencies : [threads,
+                                 libqrencode,
+                                 libxz,
+                                 liblz4],
+                 install_rpath : rootlibexecdir,
+                 install : true,
+                 install_dir : rootbindir)
+public_programs += [exe]
 
 executable('systemd-getty-generator',
            'src/getty-generator/getty-generator.c',
-           install : true,
-           install_dir : systemgeneratordir,
            include_directories : includes,
-           link_with : [libshared])
+           link_with : [libshared],
+           install_rpath : rootlibexecdir,
+           install : true,
+           install_dir : systemgeneratordir)
 
 executable('systemd-debug-generator',
            'src/debug-generator/debug-generator.c',
-           install : true,
-           install_dir : systemgeneratordir,
            include_directories : includes,
-           link_with : [libshared])
+           link_with : [libshared],
+           install_rpath : rootlibexecdir,
+           install : true,
+           install_dir : systemgeneratordir)
 
 executable('systemd-fstab-generator',
            'src/fstab-generator/fstab-generator.c',
            'src/core/mount-setup.c',
-           install : true,
-           install_dir : systemgeneratordir,
            include_directories : includes,
-           link_with : [libshared])
+           link_with : [libshared],
+           install_rpath : rootlibexecdir,
+           install : true,
+           install_dir : systemgeneratordir)
 
 if conf.get('ENABLE_ENVIRONMENT_D', 0) == 1
-  executable('30-systemd-environment-d-generator',
-             'src/environment-d-generator/environment-d-generator.c',
-             install : true,
-             install_dir : userenvgeneratordir,
-             include_directories : includes,
-             link_with : [libshared])
+        executable('30-systemd-environment-d-generator',
+                   'src/environment-d-generator/environment-d-generator.c',
+                   include_directories : includes,
+                   link_with : [libshared],
+                   install_rpath : rootlibexecdir,
+                   install : true,
+                   install_dir : userenvgeneratordir)
 
-  meson.add_install_script(meson_make_symlink,
-                           sysconfdir + '/environment',
-                           environmentdir + '/99-environment.conf')
+        meson.add_install_script(meson_make_symlink,
+                                 join_paths(sysconfdir, 'environment'),
+                                 join_paths(environmentdir, '99-environment.conf'))
 endif
 
 if conf.get('ENABLE_HIBERNATE', 0) == 1
-  executable('systemd-hibernate-resume-generator',
-             'src/hibernate-resume/hibernate-resume-generator.c',
-             include_directories : includes,
-             link_with : [libshared],
-             install : true,
-             install_dir : systemgeneratordir)
-
-  executable('systemd-hibernate-resume',
-             'src/hibernate-resume/hibernate-resume.c',
-             include_directories : includes,
-             link_with : [libshared],
-             install : true,
-             install_dir : rootlibexecdir)
+        executable('systemd-hibernate-resume-generator',
+                   'src/hibernate-resume/hibernate-resume-generator.c',
+                   include_directories : includes,
+                   link_with : [libshared],
+                   install_rpath : rootlibexecdir,
+                   install : true,
+                   install_dir : systemgeneratordir)
+
+        executable('systemd-hibernate-resume',
+                   'src/hibernate-resume/hibernate-resume.c',
+                   include_directories : includes,
+                   link_with : [libshared],
+                   install_rpath : rootlibexecdir,
+                   install : true,
+                   install_dir : rootlibexecdir)
 endif
 
 if conf.get('HAVE_BLKID', 0) == 1
-  executable('systemd-gpt-auto-generator',
-             'src/gpt-auto-generator/gpt-auto-generator.c',
-             'src/basic/blkid-util.h',
-             install : true,
-             install_dir : systemgeneratordir,
-             include_directories : includes,
-             link_with : libshared,
-             dependencies : libblkid)
-
-  executable('systemd-dissect',
-             'src/dissect/dissect.c',
-             include_directories : includes,
-             link_with : [libshared],
-             install : true,
-             install_dir : rootlibexecdir)
+        executable('systemd-gpt-auto-generator',
+                   'src/gpt-auto-generator/gpt-auto-generator.c',
+                   'src/basic/blkid-util.h',
+                   include_directories : includes,
+                   link_with : [libshared,
+                                libudev],
+                   dependencies : libblkid,
+                   install_rpath : rootlibexecdir,
+                   install : true,
+                   install_dir : systemgeneratordir)
+
+        exe = executable('systemd-dissect',
+                         'src/dissect/dissect.c',
+                         include_directories : includes,
+                         link_with : [libshared],
+                         install_rpath : rootlibexecdir,
+                         install : true,
+                         install_dir : rootlibexecdir)
+        public_programs += [exe]
 endif
 
 if conf.get('ENABLE_RESOLVED', 0) == 1
-  executable('systemd-resolved',
-             systemd_resolved_sources,
-             include_directories : includes,
-             link_with : [libshared,
-                         ],
-             dependencies : [threads,
-                             libm,
-                             libidn],
-             install : true,
-             install_dir : rootlibexecdir)
-
-  executable('systemd-resolve',
-             systemd_resolve_sources,
-             include_directories : includes,
-             link_with : [libshared,
-                         ],
-             dependencies : [threads,
-                             libm,
-                             libidn],
-             install : true)
+        executable('systemd-resolved',
+                   systemd_resolved_sources,
+                   gcrypt_util_sources,
+                   include_directories : includes,
+                   link_with : [libshared],
+                   dependencies : [threads,
+                                   libgcrypt,
+                                   libgpg_error,
+                                   libm,
+                                   libidn],
+                   install_rpath : rootlibexecdir,
+                   install : true,
+                   install_dir : rootlibexecdir)
+
+        exe = executable('systemd-resolve',
+                         systemd_resolve_sources,
+                         gcrypt_util_sources,
+                         include_directories : includes,
+                         link_with : [libshared],
+                         dependencies : [threads,
+                                         libgcrypt,
+                                         libgpg_error,
+                                         libm,
+                                         libidn],
+                         install_rpath : rootlibexecdir,
+                         install : true)
+        public_programs += [exe]
 endif
 
 if conf.get('ENABLE_LOGIND', 0) == 1
-  executable('systemd-logind',
-             systemd_logind_sources,
-             include_directories : includes,
-             link_with : [liblogind_core,
-                          libshared],
-             dependencies : [threads,
-                             libacl],
-             install : true,
-             install_dir : rootlibexecdir)
-
-  executable('loginctl',
-             loginctl_sources,
-             include_directories : includes,
-             link_with : [libshared],
-             dependencies : [threads,
-                             liblz4,
-                             libxz],
-             install : true,
-             install_dir : rootbindir)
-
-  executable('systemd-inhibit',
-             'src/login/inhibit.c',
-             include_directories : includes,
-             link_with : [libshared],
-             install : true,
-             install_dir : rootbindir)
-
-  if conf.get('HAVE_PAM', 0) == 1
-    version_script_arg = join_paths(meson.current_source_dir(), pam_systemd_sym)
-    shared_library(
-      'pam_systemd',
-      pam_systemd_c,
-      name_prefix : '',
-      include_directories : includes,
-      link_args : ['-shared',
-                   '-Wl,--version-script=' + version_script_arg],
-      link_with : [libshared],
-      dependencies : [libpam,
-                      libpam_misc],
-      link_depends : pam_systemd_sym,
-      install : true,
-      install_dir : pamlibdir)
-  endif
+        executable('systemd-logind',
+                   systemd_logind_sources,
+                   include_directories : includes,
+                   link_with : [liblogind_core,
+                                libshared,
+                                libudev],
+                   dependencies : [threads,
+                                   libacl],
+                   install_rpath : rootlibexecdir,
+                   install : true,
+                   install_dir : rootlibexecdir)
+
+        exe = executable('loginctl',
+                         loginctl_sources,
+                         include_directories : includes,
+                         link_with : [libshared,
+                                      libudev],
+                         dependencies : [threads,
+                                         liblz4,
+                                         libxz],
+                         install_rpath : rootlibexecdir,
+                         install : true,
+                         install_dir : rootbindir)
+        public_programs += [exe]
+
+        exe = executable('systemd-inhibit',
+                         'src/login/inhibit.c',
+                         include_directories : includes,
+                         link_with : [libshared],
+                         install_rpath : rootlibexecdir,
+                         install : true,
+                         install_dir : rootbindir)
+        public_programs += [exe]
+
+        if conf.get('HAVE_PAM', 0) == 1
+                version_script_arg = join_paths(meson.current_source_dir(), pam_systemd_sym)
+                pam_systemd = shared_library(
+                        'pam_systemd',
+                        pam_systemd_c,
+                        name_prefix : '',
+                        include_directories : includes,
+                        link_args : ['-shared',
+                                     '-Wl,--version-script=' + version_script_arg],
+                        link_with : [libsystemd_internal,
+                                     libshared_static],
+                        dependencies : [threads,
+                                        libpam,
+                                        libpam_misc],
+                        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
+        endif
 endif
 
 if conf.get('HAVE_PAM', 0) == 1
-  executable('systemd-user-sessions',
-             'src/user-sessions/user-sessions.c',
-             include_directories : includes,
-             link_with : [libshared],
-             install : true,
-             install_dir : rootlibexecdir)
-endif
-
-if conf.get('ENABLE_EFI', 0) == 1
-  executable('bootctl',
-             'src/boot/bootctl.c',
-             include_directories : includes,
-             link_with : [libshared],
-             dependencies : [libblkid],
-             install : true)
-endif
-
-executable('systemd-socket-activate', 'src/activate/activate.c',
-           include_directories : includes,
-           link_with : [libshared],
-           dependencies : [threads],
-           install : true)
-
-executable('systemctl', 'src/systemctl/systemctl.c',
-           include_directories : includes,
-           link_with : [libshared],
-           dependencies : [threads,
-                           libcap,
-                           libselinux,
-                           libxz,
-                           liblz4],
-           install : true,
-           install_dir : rootbindir)
+        executable('systemd-user-sessions',
+                   'src/user-sessions/user-sessions.c',
+                   include_directories : includes,
+                   link_with : [libshared],
+                   install_rpath : rootlibexecdir,
+                   install : true,
+                   install_dir : rootlibexecdir)
+endif
+
+if conf.get('ENABLE_EFI', 0) == 1 and conf.get('HAVE_BLKID', 0) == 1
+        exe = executable('bootctl',
+                         'src/boot/bootctl.c',
+                         include_directories : includes,
+                         link_with : [libshared],
+                         dependencies : [libblkid],
+                         install_rpath : rootlibexecdir,
+                         install : true)
+        public_programs += [exe]
+endif
+
+exe = executable('systemd-socket-activate', 'src/activate/activate.c',
+                 include_directories : includes,
+                 link_with : [libshared],
+                 dependencies : [threads],
+                 install_rpath : rootlibexecdir,
+                 install : true)
+public_programs += [exe]
+
+exe = executable('systemctl', 'src/systemctl/systemctl.c',
+                 include_directories : includes,
+                 link_with : [libshared],
+                 dependencies : [threads,
+                                 libcap,
+                                 libselinux,
+                                 libxz,
+                                 liblz4],
+                 install_rpath : rootlibexecdir,
+                 install : true,
+                 install_dir : rootbindir)
+public_programs += [exe]
 
 if conf.get('ENABLE_BACKLIGHT', 0) == 1
-  executable('systemd-backlight',
-             'src/backlight/backlight.c',
-             include_directories : includes,
-             link_with : [libshared],
-             install : true,
-             install_dir : rootlibexecdir)
+        executable('systemd-backlight',
+                   'src/backlight/backlight.c',
+                   include_directories : includes,
+                   link_with : [libshared,
+                                libudev],
+                   install_rpath : rootlibexecdir,
+                   install : true,
+                   install_dir : rootlibexecdir)
 endif
 
 if conf.get('ENABLE_RFKILL', 0) == 1
-  executable('systemd-rfkill',
-             'src/rfkill/rfkill.c',
-             include_directories : includes,
-             link_with : [libshared],
-             install : true,
-             install_dir : rootlibexecdir)
+        executable('systemd-rfkill',
+                   'src/rfkill/rfkill.c',
+                   include_directories : includes,
+                   link_with : [libshared,
+                                libudev],
+                   install_rpath : rootlibexecdir,
+                   install : true,
+                   install_dir : rootlibexecdir)
 endif
 
 executable('systemd-system-update-generator',
            'src/system-update-generator/system-update-generator.c',
            include_directories : includes,
            link_with : [libshared],
+           install_rpath : rootlibexecdir,
            install : true,
            install_dir : systemgeneratordir)
 
 if conf.get('HAVE_LIBCRYPTSETUP', 0) == 1
-  executable('systemd-cryptsetup',
-             'src/cryptsetup/cryptsetup.c',
-             include_directories : includes,
-             link_with : [libshared],
-             dependencies : [libcryptsetup],
-             install : true,
-             install_dir : rootlibexecdir)
-
-  executable('systemd-cryptsetup-generator',
-             'src/cryptsetup/cryptsetup-generator.c',
-             include_directories : includes,
-             link_with : [libshared],
-             dependencies : [libcryptsetup],
-             install : true,
-             install_dir : systemgeneratordir)
-
-  executable('systemd-veritysetup',
-             'src/veritysetup/veritysetup.c',
-             include_directories : includes,
-             link_with : [libshared],
-             dependencies : [libcryptsetup],
-             install : true,
-             install_dir : rootlibexecdir)
-
-  executable('systemd-veritysetup-generator',
-             'src/veritysetup/veritysetup-generator.c',
-             include_directories : includes,
-             link_with : [libshared],
-             dependencies : [libcryptsetup],
-             install : true,
-             install_dir : systemgeneratordir)
+        executable('systemd-cryptsetup',
+                   'src/cryptsetup/cryptsetup.c',
+                   include_directories : includes,
+                   link_with : [libshared],
+                   dependencies : [libcryptsetup],
+                   install_rpath : rootlibexecdir,
+                   install : true,
+                   install_dir : rootlibexecdir)
+
+        executable('systemd-cryptsetup-generator',
+                   'src/cryptsetup/cryptsetup-generator.c',
+                   include_directories : includes,
+                   link_with : [libshared],
+                   dependencies : [libcryptsetup],
+                   install_rpath : rootlibexecdir,
+                   install : true,
+                   install_dir : systemgeneratordir)
+
+        executable('systemd-veritysetup',
+                   'src/veritysetup/veritysetup.c',
+                   include_directories : includes,
+                   link_with : [libshared],
+                   dependencies : [libcryptsetup],
+                   install_rpath : rootlibexecdir,
+                   install : true,
+                   install_dir : rootlibexecdir)
+
+        executable('systemd-veritysetup-generator',
+                   'src/veritysetup/veritysetup-generator.c',
+                   include_directories : includes,
+                   link_with : [libshared],
+                   dependencies : [libcryptsetup],
+                   install_rpath : rootlibexecdir,
+                   install : true,
+                   install_dir : systemgeneratordir)
 endif
 
 if conf.get('HAVE_SYSV_COMPAT', 0) == 1
-  executable('systemd-sysv-generator',
-             'src/sysv-generator/sysv-generator.c',
-             include_directories : includes,
-             link_with : [libshared],
-             install : true,
-             install_dir : systemgeneratordir)
-
-  executable('systemd-rc-local-generator',
-             'src/rc-local-generator/rc-local-generator.c',
-             include_directories : includes,
-             link_with : [libshared],
-             install : true,
-             install_dir : systemgeneratordir)
+        executable('systemd-sysv-generator',
+                   'src/sysv-generator/sysv-generator.c',
+                   include_directories : includes,
+                   link_with : [libshared],
+                   install_rpath : rootlibexecdir,
+                   install : true,
+                   install_dir : systemgeneratordir)
+
+        executable('systemd-rc-local-generator',
+                   'src/rc-local-generator/rc-local-generator.c',
+                   include_directories : includes,
+                   link_with : [libshared],
+                   install_rpath : rootlibexecdir,
+                   install : true,
+                   install_dir : systemgeneratordir)
 endif
 
 if conf.get('ENABLE_HOSTNAMED', 0) == 1
-  executable('systemd-hostnamed',
-             'src/hostname/hostnamed.c',
-             include_directories : includes,
-             link_with : [libshared],
-             install : true,
-             install_dir : rootlibexecdir)
-
-  executable('hostnamectl',
-             'src/hostname/hostnamectl.c',
-             include_directories : includes,
-             link_with : [libshared],
-             install : true)
+        executable('systemd-hostnamed',
+                   'src/hostname/hostnamed.c',
+                   include_directories : includes,
+                   link_with : [libshared],
+                   install_rpath : rootlibexecdir,
+                   install : true,
+                   install_dir : rootlibexecdir)
+
+        exe = executable('hostnamectl',
+                         'src/hostname/hostnamectl.c',
+                         include_directories : includes,
+                         link_with : [libshared],
+                         install_rpath : rootlibexecdir,
+                         install : true)
+        public_programs += [exe]
 endif
 
 if conf.get('ENABLE_LOCALED', 0) == 1
-  executable('systemd-localed',
-             systemd_localed_sources,
-             include_directories : includes,
-             link_with : [libshared],
-             dependencies : [libdl],
-             install : true,
-             install_dir : rootlibexecdir)
-
-  executable('localectl',
-             localectl_sources,
-             include_directories : includes,
-             link_with : [libshared],
-             install : true)
+        if conf.get('HAVE_XKBCOMMON', 0) == 1
+                # logind will load libxkbcommon.so dynamically on its own
+                deps = [libdl]
+        else
+                deps = []
+        endif
+
+        executable('systemd-localed',
+                   systemd_localed_sources,
+                   include_directories : includes,
+                   link_with : [libshared],
+                   dependencies : deps,
+                   install_rpath : rootlibexecdir,
+                   install : true,
+                   install_dir : rootlibexecdir)
+
+        exe = executable('localectl',
+                         localectl_sources,
+                         include_directories : includes,
+                         link_with : [libshared],
+                         install_rpath : rootlibexecdir,
+                         install : true)
+        public_programs += [exe]
 endif
 
 if conf.get('ENABLE_TIMEDATED', 0) == 1
-  executable('systemd-timedated',
-             'src/timedate/timedated.c',
-             include_directories : includes,
-             link_with : [libshared],
-             install : true,
-             install_dir : rootlibexecdir)
-
-  executable('timedatectl',
-             'src/timedate/timedatectl.c',
-             include_directories : includes,
-             link_with : [libshared],
-             install : true)
+        executable('systemd-timedated',
+                   'src/timedate/timedated.c',
+                   include_directories : includes,
+                   link_with : [libshared],
+                   install_rpath : rootlibexecdir,
+                   install : true,
+                   install_dir : rootlibexecdir)
+
+        exe = executable('timedatectl',
+                         'src/timedate/timedatectl.c',
+                         include_directories : includes,
+                         install_rpath : rootlibexecdir,
+                         link_with : [libshared],
+                         install : true)
+        public_programs += [exe]
 endif
 
 if conf.get('ENABLE_TIMESYNCD', 0) == 1
-  executable('systemd-timesyncd',
-             systemd_timesyncd_sources,
-             include_directories : includes,
-             link_with : [libshared],
-             dependencies : [threads,
-                             libm],
-             install : true,
-             install_dir : rootlibexecdir)
+        executable('systemd-timesyncd',
+                   systemd_timesyncd_sources,
+                   include_directories : includes,
+                   link_with : [libshared],
+                   dependencies : [threads,
+                                   libm],
+                   install_rpath : rootlibexecdir,
+                   install : true,
+                   install_dir : rootlibexecdir)
 endif
 
 if conf.get('ENABLE_MACHINED', 0) == 1
-  executable('systemd-machined',
-             systemd_machined_sources,
-             include_directories : includes,
-             link_with : [libmachine_core,
-                          libshared],
-             install : true,
-             install_dir : rootlibexecdir)
-
-  executable('machinectl',
-             'src/machine/machinectl.c',
-             include_directories : includes,
-             link_with : [libshared],
-             dependencies : [threads,
-                             libxz,
-                             liblz4],
-             install : true,
-             install_dir : rootbindir)
+        executable('systemd-machined',
+                   systemd_machined_sources,
+                   include_directories : includes,
+                   link_with : [libmachine_core,
+                                libshared],
+                   install_rpath : rootlibexecdir,
+                   install : true,
+                   install_dir : rootlibexecdir)
+
+        exe = executable('machinectl',
+                         'src/machine/machinectl.c',
+                         include_directories : includes,
+                         link_with : [libshared],
+                         dependencies : [threads,
+                                         libxz,
+                                         liblz4],
+                         install_rpath : rootlibexecdir,
+                         install : true,
+                         install_dir : rootbindir)
+        public_programs += [exe]
 endif
 
 if conf.get('ENABLE_IMPORTD', 0) == 1
-  executable('systemd-importd',
-             systemd_importd_sources,
-             include_directories : includes,
-             link_with : [libshared],
-             install : true,
-             install_dir : rootlibexecdir)
-
-  executable('systemd-pull',
-             systemd_pull_sources,
-             include_directories : includes,
-             link_with : [libshared],
-             dependencies : [libcurl,
-                             libz,
-                             libbzip2,
-                             libxz,
-                             libgcrypt],
-             install : true,
-             install_dir : rootlibexecdir)
-
-  executable('systemd-import',
-             systemd_import_sources,
-             include_directories : includes,
-             link_with : [libshared],
-             dependencies : [libcurl,
-                             libz,
-                             libbzip2,
-                             libxz],
-             install : true,
-             install_dir : rootlibexecdir)
-
-  executable('systemd-export',
-             systemd_export_sources,
-             include_directories : includes,
-             link_with : [libshared],
-             dependencies : [libcurl,
-                             libz,
-                             libbzip2,
-                             libxz],
-             install : true,
-             install_dir : rootlibexecdir)
+        executable('systemd-importd',
+                   systemd_importd_sources,
+                   include_directories : includes,
+                   link_with : [libshared],
+                   dependencies : [threads],
+                   install_rpath : rootlibexecdir,
+                   install : true,
+                   install_dir : rootlibexecdir)
+
+        systemd_pull = executable('systemd-pull',
+                                  systemd_pull_sources,
+                                  include_directories : includes,
+                                  link_with : [libshared],
+                                  dependencies : [libcurl,
+                                                  libz,
+                                                  libbzip2,
+                                                  libxz,
+                                                  libgcrypt],
+                                  install_rpath : rootlibexecdir,
+                                  install : true,
+                                  install_dir : rootlibexecdir)
+
+        systemd_import = executable('systemd-import',
+                                    systemd_import_sources,
+                                    include_directories : includes,
+                                    link_with : [libshared],
+                                    dependencies : [libcurl,
+                                                    libz,
+                                                    libbzip2,
+                                                    libxz],
+                                    install_rpath : rootlibexecdir,
+                                    install : true,
+                                    install_dir : rootlibexecdir)
+
+        systemd_export = executable('systemd-export',
+                                    systemd_export_sources,
+                                    include_directories : includes,
+                                    link_with : [libshared],
+                                    dependencies : [libcurl,
+                                                    libz,
+                                                    libbzip2,
+                                                    libxz],
+                                    install_rpath : rootlibexecdir,
+                                    install : true,
+                                    install_dir : rootlibexecdir)
+        public_programs += [systemd_pull, systemd_import, systemd_export]
 endif
 
 if conf.get('ENABLE_REMOTE', 0) == 1 and conf.get('HAVE_LIBCURL', 0) == 1
-  executable('systemd-journal-upload',
-             systemd_journal_upload_sources,
-             include_directories : includes,
-             link_with : [libshared],
-             dependencies : [threads,
-                             libcurl,
-                             libgnutls,
-                             libxz,
-                             liblz4],
-             install : true,
-             install_dir : rootlibexecdir)
+        exe = executable('systemd-journal-upload',
+                         systemd_journal_upload_sources,
+                         include_directories : includes,
+                         link_with : [libshared],
+                         dependencies : [threads,
+                                         libcurl,
+                                         libgnutls,
+                                         libxz,
+                                         liblz4],
+                         install_rpath : rootlibexecdir,
+                         install : true,
+                         install_dir : rootlibexecdir)
+        public_programs += [exe]
 endif
 
 if conf.get('ENABLE_REMOTE', 0) == 1 and conf.get('HAVE_MICROHTTPD', 0) == 1
-  executable('systemd-journal-remote',
-             systemd_journal_remote_sources,
-             include_directories : includes,
-             link_with : [libshared],
-             dependencies : [threads,
-                             libmicrohttpd,
-                             libgnutls,
-                             libxz,
-                             liblz4],
-             install : true,
-             install_dir : rootlibexecdir)
-
-  executable('systemd-journal-gatewayd',
-             systemd_journal_gatewayd_sources,
-             include_directories : includes,
-             link_with : [libshared],
-             dependencies : [threads,
-                             libmicrohttpd,
-                             libgnutls,
-                             libxz,
-                             liblz4],
-             install : true,
-             install_dir : rootlibexecdir)
+        s_j_remote = executable('systemd-journal-remote',
+                                systemd_journal_remote_sources,
+                                include_directories : includes,
+                                link_with : [libshared],
+                                dependencies : [threads,
+                                                libmicrohttpd,
+                                                libgnutls,
+                                                libxz,
+                                                liblz4],
+                                install_rpath : rootlibexecdir,
+                                install : true,
+                                install_dir : rootlibexecdir)
+
+        s_j_gatewayd = executable('systemd-journal-gatewayd',
+                                  systemd_journal_gatewayd_sources,
+                                  include_directories : includes,
+                                  link_with : [libshared],
+                                  dependencies : [threads,
+                                                  libmicrohttpd,
+                                                  libgnutls,
+                                                  libxz,
+                                                  liblz4],
+                                  install_rpath : rootlibexecdir,
+                                  install : true,
+                                  install_dir : rootlibexecdir)
+        public_programs += [s_j_remote, s_j_gatewayd]
 endif
 
 if conf.get('ENABLE_COREDUMP', 0) == 1
-  executable('systemd-coredump',
-             systemd_coredump_sources,
-             include_directories : includes,
-             link_with : [libshared],
-             dependencies : [threads,
-                             libacl,
-                             libdw,
-                             libxz,
-                             liblz4],
-             install : true,
-             install_dir : rootlibexecdir)
-
-  executable('coredumpctl',
-             coredumpctl_sources,
-             include_directories : includes,
-             link_with : [libshared],
-             dependencies : [threads,
-                             libxz,
-                             liblz4],
-             install : true)
+        executable('systemd-coredump',
+                   systemd_coredump_sources,
+                   include_directories : includes,
+                   link_with : [libshared],
+                   dependencies : [threads,
+                                   libacl,
+                                   libdw,
+                                   libxz,
+                                   liblz4],
+                   install_rpath : rootlibexecdir,
+                   install : true,
+                   install_dir : rootlibexecdir)
+
+        exe = executable('coredumpctl',
+                         coredumpctl_sources,
+                         include_directories : includes,
+                         link_with : [libshared],
+                         dependencies : [threads,
+                                         libxz,
+                                         liblz4],
+                         install_rpath : rootlibexecdir,
+                         install : true)
+        public_programs += [exe]
 endif
 
 if conf.get('ENABLE_BINFMT', 0) == 1
-  executable('systemd-binfmt',
-             'src/binfmt/binfmt.c',
-             include_directories : includes,
-             link_with : [libshared],
-             install : true,
-             install_dir : rootlibexecdir)
+        exe = executable('systemd-binfmt',
+                         'src/binfmt/binfmt.c',
+                         include_directories : includes,
+                         link_with : [libshared],
+                         install_rpath : rootlibexecdir,
+                         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(sysconfdir + '/binfmt.d'))
+        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', 0) == 1
-  executable('systemd-vconsole-setup',
-             'src/vconsole/vconsole-setup.c',
-             include_directories : includes,
-             link_with : [libshared],
-             install : true,
-             install_dir : rootlibexecdir)
+        executable('systemd-vconsole-setup',
+                   'src/vconsole/vconsole-setup.c',
+                   include_directories : includes,
+                   link_with : [libshared],
+                   install_rpath : rootlibexecdir,
+                   install : true,
+                   install_dir : rootlibexecdir)
 endif
 
 if conf.get('ENABLE_RANDOMSEED', 0) == 1
-  executable('systemd-random-seed',
-             'src/random-seed/random-seed.c',
-             include_directories : includes,
-             link_with : [libshared],
-             install : true,
-             install_dir : rootlibexecdir)
+        executable('systemd-random-seed',
+                   'src/random-seed/random-seed.c',
+                   include_directories : includes,
+                   link_with : [libshared],
+                   install_rpath : rootlibexecdir,
+                   install : true,
+                   install_dir : rootlibexecdir)
 endif
 
 if conf.get('ENABLE_FIRSTBOOT', 0) == 1
-  executable('systemd-firstboot',
-             'src/firstboot/firstboot.c',
-             include_directories : includes,
-             link_with : [libshared],
-             dependencies : [libcrypt],
-             install : true,
-             install_dir : rootbindir)
+        executable('systemd-firstboot',
+                   'src/firstboot/firstboot.c',
+                   include_directories : includes,
+                   link_with : [libshared],
+                   dependencies : [libcrypt],
+                   install_rpath : rootlibexecdir,
+                   install : true,
+                   install_dir : rootbindir)
 endif
 
 executable('systemd-remount-fs',
@@ -1589,6 +1822,7 @@ executable('systemd-remount-fs',
            'src/core/mount-setup.h',
            include_directories : includes,
            link_with : [libshared],
+           install_rpath : rootlibexecdir,
            install : true,
            install_dir : rootlibexecdir)
 
@@ -1598,6 +1832,7 @@ executable('systemd-machine-id-setup',
            'src/core/machine-id-setup.h',
            include_directories : includes,
            link_with : [libshared],
+           install_rpath : rootlibexecdir,
            install : true,
            install_dir : rootbindir)
 
@@ -1605,6 +1840,7 @@ executable('systemd-fsck',
            'src/fsck/fsck.c',
            include_directories : includes,
            link_with : [libshared],
+           install_rpath : rootlibexecdir,
            install : true,
            install_dir : rootlibexecdir)
 
@@ -1612,53 +1848,66 @@ executable('systemd-sleep',
            'src/sleep/sleep.c',
            include_directories : includes,
            link_with : [libshared],
+           install_rpath : rootlibexecdir,
            install : true,
            install_dir : rootlibexecdir)
 
-executable('systemd-sysctl',
-           'src/sysctl/sysctl.c',
-           include_directories : includes,
-           link_with : [libshared],
-           install : true,
-           install_dir : rootlibexecdir)
+exe = executable('systemd-sysctl',
+                 'src/sysctl/sysctl.c',
+                 include_directories : includes,
+                 link_with : [libshared],
+                 install_rpath : rootlibexecdir,
+                 install : true,
+                 install_dir : rootlibexecdir)
+public_programs += [exe]
 
 executable('systemd-ac-power',
            'src/ac-power/ac-power.c',
            include_directories : includes,
            link_with : [libshared],
+           install_rpath : rootlibexecdir,
            install : true,
            install_dir : rootlibexecdir)
 
-executable('systemd-detect-virt',
-           'src/detect-virt/detect-virt.c',
-           include_directories : includes,
-           link_with : [libshared],
-           install : true)
-
-executable('systemd-delta',
-           'src/delta/delta.c',
-           include_directories : includes,
-           link_with : [libshared],
-           install : true)
-
-executable('systemd-escape',
-           'src/escape/escape.c',
-           include_directories : includes,
-           link_with : [libshared],
-           install : true,
-           install_dir : rootbindir)
-
-executable('systemd-notify',
-           'src/notify/notify.c',
-           include_directories : includes,
-           link_with : [libshared],
-           install : true,
-           install_dir : rootbindir)
+exe = executable('systemd-detect-virt',
+                 'src/detect-virt/detect-virt.c',
+                 include_directories : includes,
+                 link_with : [libshared],
+                 install_rpath : rootlibexecdir,
+                 install : true)
+public_programs += [exe]
+
+exe = executable('systemd-delta',
+                 'src/delta/delta.c',
+                 include_directories : includes,
+                 link_with : [libshared],
+                 install_rpath : rootlibexecdir,
+                 install : true)
+public_programs += [exe]
+
+exe = executable('systemd-escape',
+                 'src/escape/escape.c',
+                 include_directories : includes,
+                 link_with : [libshared],
+                 install_rpath : rootlibexecdir,
+                 install : true,
+                 install_dir : rootbindir)
+public_programs += [exe]
+
+exe = executable('systemd-notify',
+                 'src/notify/notify.c',
+                 include_directories : includes,
+                 link_with : [libshared],
+                 install_rpath : rootlibexecdir,
+                 install : true,
+                 install_dir : rootbindir)
+public_programs += [exe]
 
 executable('systemd-volatile-root',
            'src/volatile-root/volatile-root.c',
            include_directories : includes,
            link_with : [libshared],
+           install_rpath : rootlibexecdir,
            install : true,
            install_dir : rootlibexecdir)
 
@@ -1666,161 +1915,199 @@ executable('systemd-cgroups-agent',
            'src/cgroups-agent/cgroups-agent.c',
            include_directories : includes,
            link_with : [libshared],
+           install_rpath : rootlibexecdir,
            install : true,
            install_dir : rootlibexecdir)
 
-executable('systemd-path',
-           'src/path/path.c',
-           include_directories : includes,
-           link_with : [libshared],
-           install : true)
-
-executable('systemd-ask-password',
-           'src/ask-password/ask-password.c',
-           include_directories : includes,
-           link_with : [libshared],
-           install : true,
-           install_dir : rootbindir)
+exe = executable('systemd-path',
+                 'src/path/path.c',
+                 include_directories : includes,
+                 link_with : [libshared],
+                 install_rpath : rootlibexecdir,
+                 install : true)
+public_programs += [exe]
+
+exe = executable('systemd-ask-password',
+                 'src/ask-password/ask-password.c',
+                 include_directories : includes,
+                 link_with : [libshared],
+                 install_rpath : rootlibexecdir,
+                 install : true,
+                 install_dir : rootbindir)
+public_programs += [exe]
 
 executable('systemd-reply-password',
            'src/reply-password/reply-password.c',
            include_directories : includes,
            link_with : [libshared],
+           install_rpath : rootlibexecdir,
            install : true,
            install_dir : rootlibexecdir)
 
-executable('systemd-tty-ask-password-agent',
-           'src/tty-ask-password-agent/tty-ask-password-agent.c',
-           include_directories : includes,
-           link_with : [libshared],
-           install : true,
-           install_dir : rootbindir)
-
-executable('systemd-cgls',
-           'src/cgls/cgls.c',
-           include_directories : includes,
-           link_with : [libshared],
-           install : true)
-
-executable('systemd-cgtop',
-           'src/cgtop/cgtop.c',
-           include_directories : includes,
-           link_with : [libshared],
-           install : true)
+exe = executable('systemd-tty-ask-password-agent',
+                 'src/tty-ask-password-agent/tty-ask-password-agent.c',
+                 include_directories : includes,
+                 link_with : [libshared],
+                 install_rpath : rootlibexecdir,
+                 install : true,
+                 install_dir : rootbindir)
+public_programs += [exe]
+
+exe = executable('systemd-cgls',
+                 'src/cgls/cgls.c',
+                 include_directories : includes,
+                 link_with : [libshared],
+                 install_rpath : rootlibexecdir,
+                 install : true)
+public_programs += [exe]
+
+exe = executable('systemd-cgtop',
+                 'src/cgtop/cgtop.c',
+                 include_directories : includes,
+                 link_with : [libshared],
+                 install_rpath : rootlibexecdir,
+                 install : true)
+public_programs += [exe]
 
 executable('systemd-initctl',
            'src/initctl/initctl.c',
            include_directories : includes,
            link_with : [libshared],
+           install_rpath : rootlibexecdir,
            install : true,
            install_dir : rootlibexecdir)
 
-executable('systemd-mount',
-           'src/mount/mount-tool.c',
-           include_directories : includes,
-           link_with : [libshared],
-           install : true)
+exe = executable('systemd-mount',
+                 'src/mount/mount-tool.c',
+                 include_directories : includes,
+                 link_with : [libshared,
+                              libudev],
+                 install_rpath : rootlibexecdir,
+                 install : true)
+public_programs += [exe]
 
 meson.add_install_script(meson_make_symlink,
-                         'systemd-mount', bindir + '/systemd-umount')
-
-executable('systemd-run',
-           'src/run/run.c',
-           include_directories : includes,
-           link_with : [libshared],
-           install : true)
-
-executable('systemd-stdio-bridge',
-           'src/stdio-bridge/stdio-bridge.c',
-           include_directories : includes,
-           link_with : [libshared],
-           install : true)
-
-executable('busctl',
-           'src/busctl/busctl.c',
-           'src/busctl/busctl-introspect.c',
-           'src/busctl/busctl-introspect.h',
-           include_directories : includes,
-           link_with : [libshared],
-           install : true)
+                         'systemd-mount', join_paths(bindir, 'systemd-umount'))
+
+exe = executable('systemd-run',
+                 'src/run/run.c',
+                 include_directories : includes,
+                 link_with : [libshared],
+                 install_rpath : rootlibexecdir,
+                 install : true)
+public_programs += [exe]
+
+exe = executable('systemd-stdio-bridge',
+                 'src/stdio-bridge/stdio-bridge.c',
+                 include_directories : includes,
+                 link_with : [libshared],
+                 install_rpath : rootlibexecdir,
+                 install : true)
+public_programs += [exe]
+
+exe = executable('busctl',
+                 'src/busctl/busctl.c',
+                 'src/busctl/busctl-introspect.c',
+                 'src/busctl/busctl-introspect.h',
+                 include_directories : includes,
+                 link_with : [libshared],
+                 install_rpath : rootlibexecdir,
+                 install : true)
+public_programs += [exe]
 
 if conf.get('ENABLE_SYSUSERS', 0) == 1
-  executable('systemd-sysusers',
-             'src/sysusers/sysusers.c',
-             include_directories : includes,
-             link_with : [libshared],
-             install : true,
-             install_dir : rootbindir)
+        exe = executable('systemd-sysusers',
+                         'src/sysusers/sysusers.c',
+                         include_directories : includes,
+                         link_with : [libshared],
+                         install_rpath : rootlibexecdir,
+                         install : true,
+                         install_dir : rootbindir)
+        public_programs += [exe]
 endif
 
 if conf.get('ENABLE_TMPFILES', 0) == 1
-  executable('systemd-tmpfiles',
-             'src/tmpfiles/tmpfiles.c',
-             include_directories : includes,
-             link_with : [libshared],
-             dependencies : [libacl],
-             install : true,
-             install_dir : rootbindir)
+        exe = executable('systemd-tmpfiles',
+                         'src/tmpfiles/tmpfiles.c',
+                         include_directories : includes,
+                         link_with : [libshared],
+                         dependencies : [libacl],
+                         install_rpath : rootlibexecdir,
+                         install : true,
+                         install_dir : rootbindir)
+        public_programs += [exe]
 endif
 
 if conf.get('ENABLE_HWDB', 0) == 1
-  executable('systemd-hwdb',
-             'src/hwdb/hwdb.c',
-             'src/libsystemd/sd-hwdb/hwdb-internal.h',
-             include_directories : includes,
-             link_with : [libshared],
-             install : true,
-             install_dir : rootbindir)
+        exe = executable('systemd-hwdb',
+                         'src/hwdb/hwdb.c',
+                         'src/libsystemd/sd-hwdb/hwdb-internal.h',
+                         include_directories : includes,
+                         link_with : [libudev_internal],
+                         install_rpath : udev_rpath,
+                         install : true,
+                         install_dir : rootbindir)
+        public_programs += [exe]
 endif
 
 if conf.get('ENABLE_QUOTACHECK', 0) == 1
-  executable('systemd-quotacheck',
-             'src/quotacheck/quotacheck.c',
-             include_directories : includes,
-             link_with : [libshared],
-             install : true,
-             install_dir : rootlibexecdir)
-endif
-
-executable('systemd-socket-proxyd',
-           'src/socket-proxy/socket-proxyd.c',
-           include_directories : includes,
-           link_with : [libshared,
-                        libsystemd],
-           dependencies : [threads],
-           install : true,
-           install_dir : rootlibexecdir)
-
-executable('systemd-udevd',
-           systemd_udevd_sources,
-           include_directories : includes,
-           link_with : [libudev_core,
-                        libudev_internal,
-                        libsystemd_network,
-                        libshared],
-           dependencies : [libkmod,
-                           libidn,
-                           libacl],
-           install : true,
-           install_dir : rootlibexecdir)
-
-executable('udevadm',
-           udevadm_sources,
-           include_directories : includes,
-           link_with : [libudev_core,
-                        libudev_internal,
-                        libsystemd_network,
-                        libshared],
-           dependencies : [libkmod,
-                           libidn,
-                           libacl],
-           install : true,
-           install_dir : rootbindir)
+        executable('systemd-quotacheck',
+                   'src/quotacheck/quotacheck.c',
+                   include_directories : includes,
+                   link_with : [libshared],
+                   install_rpath : rootlibexecdir,
+                   install : true,
+                   install_dir : rootlibexecdir)
+endif
+
+exe = executable('systemd-socket-proxyd',
+                 'src/socket-proxy/socket-proxyd.c',
+                 include_directories : includes,
+                 link_with : [libshared],
+                 dependencies : [threads],
+                 install_rpath : rootlibexecdir,
+                 install : true,
+                 install_dir : rootlibexecdir)
+public_programs += [exe]
+
+exe = executable('systemd-udevd',
+                 systemd_udevd_sources,
+                 include_directories : includes,
+                 link_with : [libudev_core,
+                              libsystemd_network,
+                              libudev_internal],
+                 dependencies : [threads,
+                                 libkmod,
+                                 libidn,
+                                 libacl,
+                                 libblkid],
+                 install_rpath : udev_rpath,
+                 install : true,
+                 install_dir : rootlibexecdir)
+public_programs += [exe]
+
+exe = executable('udevadm',
+                 udevadm_sources,
+                 include_directories : includes,
+                 link_with : [libudev_core,
+                              libsystemd_network,
+                              libudev_internal],
+                 dependencies : [threads,
+                                 libkmod,
+                                 libidn,
+                                 libacl,
+                                 libblkid],
+                 install_rpath : udev_rpath,
+                 install : true,
+                 install_dir : rootbindir)
+public_programs += [exe]
 
 executable('systemd-shutdown',
            systemd_shutdown_sources,
            include_directories : includes,
-           link_with : [libshared],
+           link_with : [libshared,
+                        libudev],
+           install_rpath : rootlibexecdir,
            install : true,
            install_dir : rootlibexecdir)
 
@@ -1828,6 +2115,7 @@ executable('systemd-update-done',
            'src/update-done/update-done.c',
            include_directories : includes,
            link_with : [libshared],
+           install_rpath : rootlibexecdir,
            install : true,
            install_dir : rootlibexecdir)
 
@@ -1836,126 +2124,141 @@ executable('systemd-update-utmp',
            include_directories : includes,
            link_with : [libshared],
            dependencies : [libaudit],
+           install_rpath : rootlibexecdir,
            install : true,
            install_dir : rootlibexecdir)
 
 if conf.get('HAVE_KMOD', 0) == 1
-  executable('systemd-modules-load',
-             'src/modules-load/modules-load.c',
-             include_directories : includes,
-             link_with : [libshared],
-             dependencies : [libkmod],
-             install : true,
-             install_dir : rootlibexecdir)
-
-  meson.add_install_script('sh', '-c',
-                           mkdir_p.format(modulesloaddir))
-  meson.add_install_script('sh', '-c',
-                           mkdir_p.format(sysconfdir + '/modules-load.d'))
-endif
-
-executable('systemd-nspawn',
-           systemd_nspawn_sources,
-           'src/core/mount-setup.c', # FIXME: use a variable?
-           'src/core/mount-setup.h',
-           'src/core/loopback-setup.c',
-           'src/core/loopback-setup.h',
-           include_directories : [includes, include_directories('src/nspawn')],
-           link_with : [libfirewall,
-                        libshared],
-           dependencies : [libacl,
-                           libblkid,
-                           libseccomp,
-                           libselinux],
-           install : true)
-
-executable('systemd-networkd',
-           systemd_networkd_sources,
-           include_directories : includes,
-           link_with : [libnetworkd_core,
-                        libfirewall,
-                        libsystemd_network,
-                        libudev_internal,
-                        libshared],
-           install : true,
-           install_dir : rootlibexecdir)
-
-executable('systemd-networkd-wait-online',
-           systemd_networkd_wait_online_sources,
-           include_directories : includes,
-           link_with : [libnetworkd_core,
-                        libshared],
-           install : true,
-           install_dir : rootlibexecdir)
-
-executable('networkctl',
-           networkctl_sources,
-           include_directories : includes,
-           link_with : [libsystemd_network,
-                        libshared],
-           install : true,
-           install_dir : rootbindir)
+        executable('systemd-modules-load',
+                   'src/modules-load/modules-load.c',
+                   include_directories : includes,
+                   link_with : [libshared],
+                   dependencies : [libkmod],
+                   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?
+                 'src/core/mount-setup.h',
+                 'src/core/loopback-setup.c',
+                 'src/core/loopback-setup.h',
+                 include_directories : [includes, include_directories('src/nspawn')],
+                 link_with : [libfirewall,
+                              libshared,
+                              libudev],
+                 dependencies : [libacl,
+                                 libblkid,
+                                 libseccomp,
+                                 libselinux],
+                 install_rpath : rootlibexecdir,
+                 install : true)
+public_programs += [exe]
+
+if conf.get('ENABLE_NETWORKD', 0) == 1
+        executable('systemd-networkd',
+                   systemd_networkd_sources,
+                   include_directories : includes,
+                   link_with : [libnetworkd_core,
+                                libfirewall,
+                                libsystemd_network,
+                                libudev_internal,
+                                libshared],
+                   install_rpath : rootlibexecdir,
+                   install : true,
+                   install_dir : rootlibexecdir)
+
+        executable('systemd-networkd-wait-online',
+                   systemd_networkd_wait_online_sources,
+                   include_directories : includes,
+                   link_with : [libnetworkd_core,
+                                libshared],
+                   install_rpath : rootlibexecdir,
+                   install : true,
+                   install_dir : rootlibexecdir)
+endif
+
+exe = executable('networkctl',
+                 networkctl_sources,
+                 include_directories : includes,
+                 link_with : [libsystemd_network,
+                              libshared],
+                 install_rpath : rootlibexecdir,
+                 install : true,
+                 install_dir : rootbindir)
+public_programs += [exe]
 
 ############################################################
 
 foreach tuple : tests
-  sources = tuple[0]
-  link_with = tuple[1].length() > 0 ? tuple[1] : [libshared]
-  dependencies = tuple[2]
-  condition = tuple.length() >= 4 ? tuple[3] : ''
-  type = tuple.length() >= 5 ? tuple[4] : ''
-  defs = tuple.length() >= 6 ? tuple[5] : []
-  incs = tuple.length() >= 7 ? tuple[6] : includes
-
-  name = sources[0].split('/')[-1].split('.')[0]
-
-  if condition == '' or conf.get(condition, 0) == 1
-    install = install_tests and type == ''
-
-    exe = executable(
-        name,
-        sources,
-        include_directories : incs,
-        link_with : link_with,
-        dependencies : dependencies,
-        c_args : defs,
-        install : install,
-        install_dir : testsdir)
-
-    if type == 'manual'
-      message('@0@ is a manual test'.format(name))
-    elif type == 'unsafe' and want_tests != 'unsafe'
-      message('@0@ is an unsafe test'.format(name))
-    else
-      test(name, exe, env : test_env)
-    endif
-  else
-    message('Not compiling @0@ because @1@ is not true'.format(name, condition))
-  endif
+        sources = tuple[0]
+        link_with = tuple[1].length() > 0 ? tuple[1] : [libshared]
+        dependencies = tuple[2]
+        condition = tuple.length() >= 4 ? tuple[3] : ''
+        type = tuple.length() >= 5 ? tuple[4] : ''
+        defs = tuple.length() >= 6 ? tuple[5] : []
+        incs = tuple.length() >= 7 ? tuple[6] : includes
+        timeout = 30
+
+        name = sources[0].split('/')[-1].split('.')[0]
+        if type.startswith('timeout=')
+                timeout = type.split('=')[1].to_int()
+                type = ''
+        endif
+
+        if condition == '' or conf.get(condition, 0) == 1
+                install = install_tests and type == ''
+
+                exe = executable(
+                        name,
+                        sources,
+                        include_directories : incs,
+                        link_with : link_with,
+                        dependencies : dependencies,
+                        c_args : defs,
+                        install_rpath : rootlibexecdir,
+                        install : install,
+                        install_dir : testsdir)
+
+                if type == 'manual'
+                        message('@0@ is a manual test'.format(name))
+                elif type == 'unsafe' and want_tests != 'unsafe'
+                        message('@0@ is an unsafe test'.format(name))
+                else
+                        test(name, exe,
+                             env : test_env,
+                             timeout : timeout)
+                endif
+        else
+                message('Not compiling @0@ because @1@ is not true'.format(name, condition))
+        endif
 endforeach
 
 test_libsystemd_sym = executable(
-  'test-libsystemd-sym',
-  test_libsystemd_sym_c,
-  include_directories : includes,
-  # link_with : [libsystemd],
-  # TODO: try again with https://github.com/mesonbuild/meson/pull/1545
-  link_args : ['libsystemd.so.0.18.0'],
-  # link_depends : [libsystemd],
-  # TODO: try again after "Link_depends arguments must be strings." is solved
-  install : install_tests,
-  install_dir : testsdir)
+        'test-libsystemd-sym',
+        test_libsystemd_sym_c,
+        include_directories : includes,
+        link_with : [libsystemd],
+        install : install_tests,
+        install_dir : testsdir)
 test('test-libsystemd-sym',
      test_libsystemd_sym)
 
 test_libudev_sym = executable(
-  'test-libudev-sym',
-  test_libudev_sym_c,
-  include_directories : includes,
-  c_args : ['-Wno-deprecated-declarations'],
-  link_args : ['src/libudev/libudev.so.1.6.6'],
-  install : install_tests,
-  install_dir : testsdir)
+        'test-libudev-sym',
+        test_libudev_sym_c,
+        include_directories : includes,
+        c_args : ['-Wno-deprecated-declarations'],
+        link_with : [libudev],
+        install : install_tests,
+        install_dir : testsdir)
 test('test-libudev-sym',
      test_libudev_sym)
 
@@ -1963,6 +2266,8 @@ test('test-libudev-sym',
 
 make_directive_index_py = find_program('tools/make-directive-index.py')
 make_man_index_py = find_program('tools/make-man-index.py')
+xml_helper_py = find_program('tools/xml_helper.py')
+hwdb_update_sh = find_program('tools/meson-hwdb-update.sh')
 
 subdir('units')
 subdir('sysctl.d')
@@ -2002,17 +2307,54 @@ meson.add_install_script('sh', '-c', 'touch $DESTDIR@0@'.format(prefixdir))
 
 ############################################################
 
+meson_check_help = find_program('tools/meson-check-help.sh')
+
+foreach exec : public_programs
+        name = exec.full_path().split('/')[-1]
+        test('check-help-' + name,
+             meson_check_help,
+             args : [exec.full_path()])
+endforeach
+
+############################################################
+
 if git.found() and etags.found()
-  all_files = run_command(
-      git,
-      ['--git-dir=@0@/.git'.format(meson.source_root()),
-       'ls-files',
-       ':/*.[ch]'])
-  all_files = files(all_files.stdout().split())
-
-  custom_target(
-    'TAGS',
-    output : 'TAGS',
-    input : all_files,
-    command : [etags, '-o', '@OUTPUT@'] + all_files)
+        all_files = run_command(
+                git,
+                ['--git-dir=@0@/.git'.format(meson.source_root()),
+                 'ls-files',
+                 ':/*.[ch]'])
+        all_files = files(all_files.stdout().split())
+
+        custom_target(
+                'TAGS',
+                output : 'TAGS',
+                input : all_files,
+                command : [etags, '-o', '@OUTPUT@'] + all_files)
+endif
+
+if git.found()
+        meson_git_contrib_sh = find_program('tools/meson-git-contrib.sh')
+        run_target(
+                'git-contrib',
+                command : [meson_git_contrib_sh])
+endif
+
+if git.found()
+        git_head = run_command(
+                git,
+                ['--git-dir=@0@/.git'.format(meson.source_root()),
+                 'rev-parse', 'HEAD']).stdout().strip()
+        git_head_short = run_command(
+                git,
+                ['--git-dir=@0@/.git'.format(meson.source_root()),
+                 'rev-parse', '--short=7', 'HEAD']).stdout().strip()
+
+        run_target(
+                'git-snapshot',
+                command : ['git', 'archive',
+                           '-o', '@0@/systemd-@1@.tar.gz'.format(meson.source_root(),
+                                                                 git_head_short),
+                           '--prefix', 'systemd-@0@/'.format(git_head),
+                           'HEAD'])
 endif