[PATCH xserver 1/2] meson: Enable SUN-DES-1 auth code

[Jon Turney]

On 08/01/2018 20:50, Adam Jackson wrote:
> ---
>   include/meson.build | 1 +
>   meson_options.txt   | 1 +
>   os/meson.build      | 4 ++++
>   3 files changed, 6 insertions(+)

After this, I needed something like the attached.





-------------- next part --------------
From 6f11847ccf0cc5833e73dba79380ec6ae5123782 Mon Sep 17 00:00:00 2001
From: Jon Turney <jon.turney at dronecode.org.uk>
Date: Wed, 17 Jan 2018 13:43:47 +0000
Subject: [PATCH xserver] meson: look for Secure RPC authentication function in
 tirpc

If Secure RPC authentication isn't found in libc, look for it in tirpc.

Signed-off-by: Jon Turney <jon.turney at dronecode.org.uk>
---

Notes:
    This does something different to XTRANS_SECURE_RPC_FLAGS, which I hadn't
    realized could be doing something like this.
    
    But maybe I should just default this to false for me, instead.

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

diff --git a/os/meson.build b/os/meson.build
index 54124d32a..e2ab68346 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')
+    if not (cc.has_function('_authenticate') or cc.has_function('__authenticate'))
+        rpc_dep = dependency('libtirpc')
+    endif
     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,
-- 
2.15.1