diff options
| author | Ray Strode <halfline@gmail.com> | 2021-10-08 17:15:15 +0000 |
|---|---|---|
| committer | Ray Strode <halfline@gmail.com> | 2021-10-08 17:15:15 +0000 |
| commit | 358825d4cf08c7e28d7c8364325a6a68649522de (patch) | |
| tree | 4e0d0b62b4221001681d860334cb423f52527fc8 | |
| parent | a42b17ec90fdf5150f8bb9db8c124bcf0a6c7529 (diff) | |
| parent | cfb2a1b29689b52c7badaf73f5c21b0dbbe51b10 (diff) | |
| download | gdm-358825d4cf08c7e28d7c8364325a6a68649522de.tar.gz | |
Merge branch 'Xorg-listen' into 'main'
meson: Fix detection of Xorg versions that need -listen tcp
Closes #704
See merge request GNOME/gdm!161
| -rw-r--r-- | meson.build | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/meson.build b/meson.build index dde2a815..e0c56225 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')) |