diff options
| author | Eric Anholt <eric@anholt.net> | 2018-08-07 16:23:18 -0700 |
|---|---|---|
| committer | Adam Jackson <ajax@redhat.com> | 2018-08-09 13:42:54 -0400 |
| commit | 4ba786677050684c8801201f6bd83ce884f2885e (patch) | |
| tree | 115a2a113667d7f4bc5ade854fbca7c101e4b7e2 | |
| parent | e047da37becc23a8d2549d8f264aaa18e4965186 (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>
| -rw-r--r-- | include/meson.build | 2 | ||||
| -rw-r--r-- | os/meson.build | 12 |
2 files changed, 12 insertions, 2 deletions
diff --git a/include/meson.build b/include/meson.build index 6d08b0573..2c139e6b0 100644 --- a/include/meson.build +++ b/include/meson.build @@ -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') 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, ) |