[PATCH xserver 10/10] meson: Add detection of libsystemd-daemon.

[Peter Hutterer]

On Tue, Aug 07, 2018 at 04:23:19PM -0700, Eric Anholt wrote:
> This enables Xtrans's systemd socket activation.
> 
> Signed-off-by: Eric Anholt <eric at anholt.net>
> ---
>  include/meson.build | 3 ++-
>  meson.build         | 7 +++++++
>  2 files changed, 9 insertions(+), 1 deletion(-)
> 
> diff --git a/include/meson.build b/include/meson.build
> index 2c139e6b0651..9a7547c4708a 100644
> --- a/include/meson.build
> +++ b/include/meson.build
> @@ -72,7 +72,8 @@ elif cc.compiles('''
>  endif
>  
>  conf_data.set('HAVE_LIBBSD', libbsd_dep.found())
> -# XXX: HAVE_SYSTEMD_DAEMON
> +# Note: this symbol is used by libXtrans.
> +conf_data.set('HAVE_SYSTEMD_DAEMON', libsystemd_daemon_dep.found())
>  conf_data.set('CONFIG_UDEV', build_udev)
>  conf_data.set('CONFIG_UDEV_KMS', build_udev)
>  conf_data.set('HAVE_DBUS', build_dbus)
> diff --git a/meson.build b/meson.build
> index 8c21c646ab89..5275373bd3b4 100644
> --- a/meson.build
> +++ b/meson.build
> @@ -96,6 +96,12 @@ nettle_dep = dependency('nettle')
>  dbus_required = get_option('systemd_logind') == 'true'
>  dbus_dep = dependency('dbus-1', version: '>= 1.0', required: dbus_required)
>  
> +# libsystemd-daemon was moved into libsystemd in version 209
> +libsystemd_daemon_dep = dependency('libsystemd', version: '>= 209', required: false)
> +if not libsystemd_daemon_dep.found()
> +    libsystemd_daemon_dep = dependency('libsystemd-daemon', required: false)
> +endif

we require meson > 0.42, released Sep 2017, but check for systemd > 209,
released in Feb 2014. even e.g. RHEL7 is on systemd 219. IMO you can drop
the second three lines here. 

but either way, series is
Reviewed-by: Peter Hutterer <peter.hutterer at who-t.net>

Cheers,
   Peter

> +
>  build_hashtable = false
>  
>  # Resolve default values of some options
> @@ -452,6 +458,7 @@ common_dep = [
>      xcmiscproto_dep,
>      bigreqsproto_dep,
>      xtrans_dep,
> +    libsystemd_daemon_dep,
>  
>      videoproto_dep,
>      compositeproto_dep,
> -- 
> 2.18.0
> 
> _______________________________________________
> xorg-devel at lists.x.org: X.Org development
> Archives: http://lists.x.org/archives/xorg-devel
> Info: https://lists.x.org/mailman/listinfo/xorg-devel
>