[gdm/fix-udev-race: 28/44] meson: Fix detection of Xorg versions that need -listen tcp




commit 0e2bec0d4d2424c7e5fc72f885bbfa974ccb12ff
Author: Alan Coopersmith <alan coopersmith oracle com>
Date:   Thu Oct 7 18:22:11 2021 -0700

    meson: Fix detection of Xorg versions that need -listen tcp
    
    Closes #704

 meson.build | 4 ++++
 1 file changed, 4 insertions(+)
---
diff --git a/meson.build b/meson.build
index dde2a8158..e0c56225b 100644
--- a/meson.build
+++ b/meson.build
@@ -69,6 +69,9 @@ x_deps = declare_dependency(
     dependency('xau'),
   ],
 )
+# Xserver 1.17 & later default to -nolisten and require -listen for remote access
+xserver_deps = dependency('xorg-server', version : '>=1.17', required : false)
+xserver_nolisten_default = xserver_deps.found()
 find_x_server_script = find_program('build-aux/find-x-server.sh', native: true)
 find_x_server_out = run_command(find_x_server_script).stdout().strip()
 if find_x_server_out != ''
@@ -224,6 +227,7 @@ conf.set('HAVE_PAM_SYSLOG', have_pam_syslog)
 conf.set('HAVE_KEYUTILS', keyutils_dep.found())
 conf.set('SUPPORTS_PAM_EXTENSIONS', pam_extensions_supported)
 conf.set('HAVE_SELINUX', libselinux_dep.found())
+conf.set('HAVE_XSERVER_THAT_DEFAULTS_TO_LOCAL_ONLY', xserver_nolisten_default)
 conf.set('ENABLE_USER_DISPLAY_SERVER', get_option('user-display-server'))
 conf.set('ENABLE_SYSTEMD_JOURNAL', get_option('systemd-journal'))
 conf.set('ENABLE_WAYLAND_SUPPORT', get_option('wayland-support'))


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]