Fix elogind being non-reactive to laptop lid events.

[elogind.git] / meson.build

diff --git a/meson.build b/meson.build
index cdb4dedc880eabd2f0e5177cdac9894dd5b6be6a..8b62c789ede34904f7bcf3f1d3348e6feb4b3861 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -16,7 +16,7 @@ project('elogind', 'c',
 # libsystemd_version = '0.23.0'
 # libudev_version = '1.6.11'
 #else
-libelogind_version = '0.22.0'
+libelogind_version = '0.23.0'
 #endif // 0
 
 # We need the same data in two different formats, ugh!
@@ -509,6 +509,13 @@ foreach decl : ['char16_t',
         conf.set10('HAVE_' + decl.underscorify().to_upper(), have)
 endforeach
 
+conf.set10('HAVE_STRUCT_STATX_IN_SYS_STAT_H', cc.sizeof('struct statx', prefix : '''
+#include <sys/stat.h>
+''', args : '-D_GNU_SOURCE') > 0)
+conf.set10('HAVE_STRUCT_STATX_IN_LINUX_STAT_H', cc.sizeof('struct statx', prefix : '''
+#include <linux/stat.h>
+''', args : '-D_GNU_SOURCE') > 0)
+
 foreach decl : [['IFLA_INET6_ADDR_GEN_MODE',         'linux/if_link.h'],
                 ['IN6_ADDR_GEN_MODE_STABLE_PRIVACY', 'linux/if_link.h'],
                 ['IFLA_VRF_TABLE',                   'linux/if_link.h'],
@@ -888,7 +895,7 @@ enable_debug_mmap_cache = false
 #if 1 /// additional elogind debug mode
 enable_debug_elogind = false
 #endif // 1
-foreach name : get_option('debug')
+foreach name : get_option('debug-extra')
         if name == 'hashmap'
                 enable_debug_hashmap = true
         elif name == 'mmap-cache'
@@ -1442,6 +1449,19 @@ conf.set10('ENABLE_EFI', have)
 
 #####################################################################
 
+#if 1 /// These are not needed by elogind, but meson wants them although they are commented out.
+conf.set_quoted('CERTIFICATE_ROOT',                 '/dev/null')
+conf.set_quoted('MEMORY_ACCOUNTING_DEFAULT_YES_NO', 'N/A')
+conf.set_quoted('MOUNT_PATH',                       '/dev/null')
+conf.set_quoted('SYSTEM_ENV_GENERATOR_PATH',        '/dev/null')
+conf.set_quoted('SYSTEM_GENERATOR_PATH',            '/dev/null')
+conf.set_quoted('UMOUNT_PATH',                      '/dev/null')
+conf.set_quoted('USER_ENV_GENERATOR_PATH',          '/dev/null')
+conf.set_quoted('USER_GENERATOR_PATH',              '/dev/null')
+#####################################################################
+
+#endif // 1
+
 config_h = configure_file(
         output : 'config.h',
         configuration : conf)
@@ -3170,28 +3190,31 @@ status = [
 
         'split /usr:                        @0@'.format(split_usr),
         'split bin-sbin:                    @0@'.format(split_bin),
-#if 0 /// UNSUPPORTED by elogind
-#         'prefix directory:                  @0@'.format(prefixdir),
-#         'rootprefix directory:              @0@'.format(rootprefixdir),
-#         'sysconf directory:                 @0@'.format(sysconfdir),
-#         'include directory:                 @0@'.format(includedir),
-#         'lib directory:                     @0@'.format(libdir),
-#         'rootlib directory:                 @0@'.format(rootlibdir),
-#         'SysV init scripts:                 @0@'.format(sysvinit_path),
-#         'SysV rc?.d directories:            @0@'.format(sysvrcnd_path),
-#else
+        'prefix directory:                  @0@'.format(prefixdir),
+        'rootprefix directory:              @0@'.format(rootprefixdir),
+        'sysconf directory:                 @0@'.format(sysconfdir),
+        'include directory:                 @0@'.format(includedir),
+        'lib directory:                     @0@'.format(libdir),
+        'rootlib directory:                 @0@'.format(rootlibdir),
+#if 1 /// Needed by elogind
         'rootexeclib dir:                   @0@'.format(rootlibexecdir),
+#endif // 1
+#if 0 /// UNNEEDED by elogind
+#        'SysV init scripts:                 @0@'.format(sysvinit_path),
+#        'SysV rc?.d directories:            @0@'.format(sysvrcnd_path),
 #endif // 0
+        'PAM modules directory:             @0@'.format(pamlibdir),
+        'PAM configuration directory:       @0@'.format(pamconfdir),
+#if 0 /// UNNEEDED by elogind
+#        'RPM macros directory:              @0@'.format(rpmmacrosdir),
+#endif // 0
+        'modprobe.d directory:              @0@'.format(modprobedir),
+        'D-Bus policy directory:            @0@'.format(dbuspolicydir),
+        'D-Bus session directory:           @0@'.format(dbussessionservicedir),
+        'D-Bus system directory:            @0@'.format(dbussystemservicedir),
+        'bash completions directory:        @0@'.format(bashcompletiondir),
+        'zsh completions directory:         @0@'.format(zshcompletiondir),
 #if 0 /// UNSUPPORTED by elogind
-#         'PAM modules directory:             @0@'.format(pamlibdir),
-#         'PAM configuration directory:       @0@'.format(pamconfdir),
-#         'RPM macros directory:              @0@'.format(rpmmacrosdir),
-#         'modprobe.d directory:              @0@'.format(modprobedir),
-#         'D-Bus policy directory:            @0@'.format(dbuspolicydir),
-#         'D-Bus session directory:           @0@'.format(dbussessionservicedir),
-#         'D-Bus system directory:            @0@'.format(dbussystemservicedir),
-#         'bash completions directory:        @0@'.format(bashcompletiondir),
-#         'zsh completions directory:         @0@'.format(zshcompletiondir),
 #         'extra start script:                @0@'.format(get_option('rc-local')),
 #         'extra stop script:                 @0@'.format(get_option('halt-local')),
 #         'debug shell:                       @0@ @ @1@'.format(get_option('debug-shell'),
@@ -3212,8 +3235,10 @@ status = [
 #         'render group access mode:          @0@'.format(get_option('group-render-mode')),
 #         'certificate root directory:        @0@'.format(get_option('certificate-root')),
 #         'support URL:                       @0@'.format(support_url),
-#         'nobody user name:                  @0@'.format(nobody_user),
-#         'nobody group name:                 @0@'.format(nobody_group),
+#endif // 0
+        'nobody user name:                  @0@'.format(nobody_user),
+        'nobody group name:                 @0@'.format(nobody_group),
+#if 0 /// UNSUPPORTED by elogind
 #         'fallback hostname:                 @0@'.format(get_option('fallback-hostname')),
 #         'symbolic gateway hostnames:        @0@'.format(', '.join(gateway_hostnames)),
 #