andreacavalli
/
xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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>
This commit is contained in:
Thierry Reding 2018-03-28 14:04:32 +02:00 committed by Adam Jackson
parent 0a7dabc86c
commit 66402fcd82
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/meson.build
View File

@ -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)

8
meson.build
View File

@ -288,11 +288,17 @@ endif
# XXX: Add more sha1 options, because Linux is about choice
sha1_dep = nettle_dep
xdmcp_dep = []
xdmcp_dep = dependency('', required : false)
if get_option('xdmcp')
xdmcp_dep = dependency('xdmcp')
endif
has_xdm_auth = get_option('xdm-auth-1')
if not xdmcp_dep.found()
has_xdm_auth = false
endif
build_glx = get_option('glx')
libdrm_dep = dependency('libdrm', version: '>= 2.4.89', required: false)