[PATCH xserver 2/6] meson: Automatically detect support for XTRANS_SEND_FDs.

Eric Anholt eric at anholt.net
Wed Aug 1 20:49:50 UTC 2018


The SCM_RIGHTS flag seems to be the thing that xtrans depends on, and
meson makes the check easy without needing a build option.

Signed-off-by: Eric Anholt <eric at anholt.net>
---
 include/meson.build | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/include/meson.build b/include/meson.build
index dfca3c3407fa..9682827dd5e9 100644
--- a/include/meson.build
+++ b/include/meson.build
@@ -156,8 +156,10 @@ conf_data.set('_XITYPEDEF_POINTER', '1')
 conf_data.set('LISTEN_TCP', get_option('listen_tcp'))
 conf_data.set('LISTEN_UNIX', get_option('listen_unix'))
 conf_data.set('LISTEN_LOCAL', get_option('listen_local'))
-# XXX: Configurable?
-conf_data.set('XTRANS_SEND_FDS', '1')
+
+if cc.has_header_symbol('sys/socket.h', 'SCM_RIGHTS')
+  conf_data.set('XTRANS_SEND_FDS', '1')
+endif
 
 conf_data.set('TCPCONN', '1')
 conf_data.set('UNIXCONN', '1')
-- 
2.18.0



More information about the xorg-devel mailing list