xserver: Branch 'master'

[Adam Jackson]

 os/meson.build |    5 +++++
 1 file changed, 5 insertions(+)

New commits:
commit 514d2c243e01b114de304ea72226bbf8772b1b11
Author: Jon Turney <jon.turney at dronecode.org.uk>
Date:   Wed Jan 17 13:43:47 2018 +0000

    meson: Use and prefer tirpc for Secure RPC authentication
    
    Reviewed-by: Adam Jackson <ajax at redhat.com>

diff --git a/os/meson.build b/os/meson.build
index 54124d32a..ff3a4615b 100644
--- a/os/meson.build
+++ b/os/meson.build
@@ -54,7 +54,11 @@ if get_option('xdmcp')
     srcs_os += 'xdmcp.c'
 endif
 
+rpc_dep = []
 if get_option('secure-rpc')
+    # prefer libtirpc (if available), otherwise assume RPC functions are
+    # provided by libc.
+    rpc_dep = dependency('libtirpc', required: false)
     srcs_os += 'rpcauth.c'
 endif
 
@@ -73,6 +77,7 @@ libxserver_os = static_library('libxserver_os',
         common_dep,
         dl_dep,
         sha1_dep,
+        rpc_dep,
         dependency('xau')
     ],
     link_with: libxlibc,