[xserver v2] configure.ac: Add support for new versions of systemd

Peter Hutterer peter.hutterer at who-t.net
Mon Mar 23 22:29:14 PDT 2015


On Mon, Mar 23, 2015 at 02:39:24AM +0000, Javier Jardón wrote:
> ... that only provide a unique libsystemd.pc file
> 
> Signed-off-by: Javier Jardón <jjardon at gnome.org>

Reviewed-by: Peter Hutterer <peter.hutterer at who-t.net>

Cheers,
   Peter

> ---
>  configure.ac | 6 ++++--
>  1 file changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/configure.ac b/configure.ac
> index 280c369..0456577 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -831,8 +831,10 @@ AC_ARG_WITH([systemd-daemon],
>  	AS_HELP_STRING([--with-systemd-daemon],
>  		[support systemd socket activation (default: auto)]),
>  	[WITH_SYSTEMD_DAEMON=$withval], [WITH_SYSTEMD_DAEMON=auto])
> -PKG_CHECK_MODULES([SYSTEMD_DAEMON], [libsystemd-daemon],
> -                  [HAVE_SYSTEMD_DAEMON=yes], [HAVE_SYSTEMD_DAEMON=no])
> +PKG_CHECK_MODULES([SYSTEMD_DAEMON], [libsystemd >= 209],
> +                  [HAVE_SYSTEMD_DAEMON=yes],
> +                  [PKG_CHECK_MODULES([SYSTEMD_DAEMON], [libsystemd-daemon],
> +                                     [HAVE_SYSTEMD_DAEMON=yes], [HAVE_SYSTEMD_DAEMON=no])])
>  if test "x$WITH_SYSTEMD_DAEMON" = xauto; then
>  	WITH_SYSTEMD_DAEMON="$HAVE_SYSTEMD_DAEMON"
>  fi
> -- 
> 2.3.3
> 
> _______________________________________________
> xorg-devel at lists.x.org: X.Org development
> Archives: http://lists.x.org/archives/xorg-devel
> Info: http://lists.x.org/mailman/listinfo/xorg-devel
> 


More information about the xorg-devel mailing list