diff options
| author | Thierry Reding <treding@nvidia.com> | 2018-03-28 14:04:32 +0200 |
|---|---|---|
| committer | Adam Jackson <ajax@redhat.com> | 2018-03-28 09:54:14 -0400 |
| commit | 66402fcd8280b393d3992121c0bcff9c646c97ed (patch) | |
| tree | f6bf8f69b83b7b868532094f7e877e923fbb444f /include | |
| parent | 0a7dabc86c1a7b8d91a5d22ad12fbf03d859f43e (diff) | |
meson: Fix build if Xdmcp is missing
Xdmcp is an optional dependency, so make sure the build succeeds if it
is missing.
Signed-off-by: Thierry Reding <treding@nvidia.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/meson.build | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/meson.build b/include/meson.build index c64af59f5..4a2798514 100644 --- a/include/meson.build +++ b/include/meson.build @@ -91,7 +91,7 @@ conf_data.set_quoted('COMPILEDDEFAULTFONTPATH', default_font_path) conf_data.set('XORG_VERSION_CURRENT', release) -conf_data.set('HASXDMAUTH', get_option('xdm-auth-1')) +conf_data.set('HASXDMAUTH', has_xdm_auth) conf_data.set('SECURE_RPC', get_option('secure-rpc')) conf_data.set('HAVE_DLFCN_H', cc.has_header('dlfcn.h')) @@ -182,7 +182,7 @@ conf_data.set('SHAPE', '1') conf_data.set('XACE', build_xace) conf_data.set('XCMISC', '1') conf_data.set('XCSECURITY', build_xsecurity) -conf_data.set('XDMCP', get_option('xdmcp')) +conf_data.set('XDMCP', xdmcp_dep.found()) conf_data.set('XF86BIGFONT', build_xf86bigfont) conf_data.set('XF86DRI', build_dri1) conf_data.set('XF86VIDMODE', build_xf86vidmode) |