1cff906
Avoid the Xorg build-time dependency, as we already know the answers
1cff906
to the questions that are trying to be determined.
1cff906
1cff906
diff --git a/meson.build b/meson.build
1cff906
index bf0e58506..7d8f964c3 100644
1cff906
--- a/meson.build
1cff906
+++ b/meson.build
1cff906
@@ -92,8 +92,9 @@ if find_x_server_out != ''
1cff906
 else
1cff906
   # what to do, what to do, this is wrong, but this just sets the
1cff906
   # defaults, perhaps this user is cross compiling or some such
1cff906
-  x_path = '/usr/bin/X11:/usr/X11R6/bin:/opt/X11R6/bin'
1cff906
-  x_bin = '/usr/bin/X'
1cff906
+  x_path = '/usr/bin'
1cff906
+  x_bin = '/usr/bin/Xorg'
1cff906
+  xserver_has_listen = true
1cff906
 endif
1cff906
 xdmcp_dep = cc.find_library('Xdmcp', required: get_option('xdmcp'))
1cff906
 if xdmcp_dep.found() and get_option('tcp-wrappers')