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>
This commit is contained in:
parent
e047da37be
commit
4ba7866770
|
@ -182,8 +182,6 @@ conf_data.set('TCPCONN', '1')
|
|||
conf_data.set('UNIXCONN', '1')
|
||||
conf_data.set('IPv6', build_ipv6)
|
||||
|
||||
conf_data.set('CLIENTIDS', '1') # XXX
|
||||
|
||||
conf_data.set('BIGREQS', '1')
|
||||
conf_data.set('COMPOSITE', '1')
|
||||
conf_data.set('DAMAGE', '1')
|
||||
|
|
|
@ -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,
|
||||
)
|
||||
|
|
Loading…
Reference in New Issue
Block a user