From: Karel Zak <kzak@redhat.com>
Date: Wed, 16 Aug 2023 07:29:50 +0000 (+0200)
Subject: Merge branch 'logind' of https://github.com/thkukuk/util-linux
X-Git-Tag: v2.40-rc1~274
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8032ccb61223c2108c010a43cebaa542b82a4dff;p=thirdparty%2Futil-linux.git

Merge branch 'logind' of https://github.com/thkukuk/util-linux

* 'logind' of https://github.com/thkukuk/util-linux:
  write: query logind for list of users with tty (#2088)
  agetty: use sd_get_sessions() for number of users (#2088)
  wall: query logind for list of users with tty (#2088)
---

8032ccb61223c2108c010a43cebaa542b82a4dff
diff --cc meson.build
index 58630eb8b3,66d90e15ae..221ae373b6
--- a/meson.build
+++ b/meson.build
@@@ -318,8 -310,12 +318,13 @@@ lib_systemd = dependency
    'libsystemd',
    required : get_option('systemd'))
  conf.set('HAVE_LIBSYSTEMD', lib_systemd.found() ? 1 : false)
 +conf.set('USE_SYSTEMD', lib_systemd.found() ? 1 : false)
  
+ have = cc.has_function(
+   'sd_session_get_username',
+   dependencies : lib_systemd)
+ conf.set('HAVE_DECL_SD_SESSION_GET_USERNAME', have ? 1 : false)
+ 
  lib_udev = dependency(
    'libudev',
    required : get_option('systemd'))
@@@ -2416,8 -2367,8 +2421,9 @@@ exe = executable
    wall_sources,
    include_directories : includes,
    link_with : [lib_common],
+   dependencies : [lib_systemd],
    install_dir : usrbin_exec_dir,
 +  install_mode : 'rwxr-sr-x',
    install : opt,
    build_by_default : opt)
  if opt
@@@ -2435,8 -2386,8 +2441,9 @@@ exe = executable
    write_sources,
    include_directories : includes,
    link_with : [lib_common],
+   dependencies : [lib_systemd],
    install_dir : usrbin_exec_dir,
 +  install_mode : 'rwxr-sr-x',
    install : opt,
    build_by_default : opt)
  if opt