summaryrefslogtreecommitdiff
path: root/os
diff options
context:
space:
mode:
authorEric Anholt <eric@anholt.net>2018-08-07 16:23:18 -0700
committerAdam Jackson <ajax@redhat.com>2018-08-09 13:42:54 -0400
commit4ba786677050684c8801201f6bd83ce884f2885e (patch)
tree115a2a113667d7f4bc5ade854fbca7c101e4b7e2 /os
parente047da37becc23a8d2549d8f264aaa18e4965186 (diff)
meson: Get close to parity with autotools for CLIENTIDS tracking.
The client ID is only needed for XRes, and autotools build ignores the --clientids= arg if xres is disabled. We haven't made a meson option for disabling tracking client ids (is it actually worth a build option?), so just make this depend on xres. Signed-off-by: Eric Anholt <eric@anholt.net> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Diffstat (limited to 'os')
-rw-r--r--os/meson.build12
1 files changed, 12 insertions, 0 deletions
diff --git a/os/meson.build b/os/meson.build
index 0e41f9c02..f6313807a 100644
--- a/os/meson.build
+++ b/os/meson.build
@@ -66,6 +66,16 @@ if get_option('secure-rpc')
srcs_os += 'rpcauth.c'
endif
+os_dep = []
+os_c_args = []
+if get_option('xres')
+ # Only the XRes extension cares about the client ID.
+ os_c_args += '-DCLIENTIDS'
+ if host_machine.system() == 'openbsd'
+ os_deps += cc.find_library('kvm')
+ endif
+endif
+
libxlibc = []
if srcs_libc.length() > 0
libxlibc = static_library('libxlibc',
@@ -85,7 +95,9 @@ libxserver_os = static_library('libxserver_os',
dl_dep,
sha1_dep,
rpc_dep,
+ os_dep,
dependency('xau')
],
+ c_args: os_c_args,
link_with: libxlibc,
)