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

[Pekka Paalanen]

On Tue, 10 Mar 2015 17:36:08 +0000
Javier Jardón <jjardon at gnome.org> wrote:

> ... that only provide a unique libsystemd.pc file
> ---
>  configure.ac | 8 ++++++--
>  1 file changed, 6 insertions(+), 2 deletions(-)
> 
> diff --git a/configure.ac b/configure.ac
> index d9d8d8f..561c380 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -347,8 +347,12 @@ AS_IF([test "x$have_systemd_login" = "xyes"],
>        [AC_DEFINE([HAVE_SYSTEMD_LOGIN], [1], [Have systemd-login])])
>  AM_CONDITIONAL(HAVE_SYSTEMD_LOGIN, test "x$have_systemd_login" = "xyes")
>  
> -PKG_CHECK_MODULES(SYSTEMD_LOGIN_209, [libsystemd-login >= 209],
> -                  [have_systemd_login_209=yes], [have_systemd_login_209=no])
> +PKG_CHECK_MODULES([SYSTEMD_LOGIN_209],
> +                  [libsystemd >= 209],
> +                  [have_systemd_login_209=yes],
> +                  [PKG_CHECK_MODULES([SYSTEMD_LOGIN_209],
> +                                     [libsystemd-login >= 209],
> +                                     [have_systemd_login_209=yes], [have_systemd_login_209=no])])
>  AS_IF([test "x$have_systemd_login_209" = "xyes"],
>        [AC_DEFINE([HAVE_SYSTEMD_LOGIN_209], [1], [Have systemd-login >= 209])])
>  

Hi,

let's get a bit more context, the whole systemd-login thing in
configure.ac is:

PKG_CHECK_MODULES(SYSTEMD_LOGIN, [libsystemd-login >= 198],
                  [have_systemd_login=yes], [have_systemd_login=no])
AS_IF([test "x$have_systemd_login" = "xyes"],
      [AC_DEFINE([HAVE_SYSTEMD_LOGIN], [1], [Have systemd-login])])
AM_CONDITIONAL(HAVE_SYSTEMD_LOGIN, test "x$have_systemd_login" = "xyes")

PKG_CHECK_MODULES(SYSTEMD_LOGIN_209, [libsystemd-login >= 209],
                  [have_systemd_login_209=yes], [have_systemd_login_209=no])
AS_IF([test "x$have_systemd_login_209" = "xyes"],
      [AC_DEFINE([HAVE_SYSTEMD_LOGIN_209], [1], [Have systemd-login >= 209])])

You're saying that in a quite new version of systemd, there is no
longer libsystemd-login.pc, right?

Shouldn't we also fix the first test for >= 198?

If you grep for SYSTEMD, you see most things using SYSTEMD_LOGIN and
only few using SYSTEMD_LOGIN_209. The test for >= 198 is the main
toggle.

Does libsystemd >= 209 guarantee "logind-dev" is there?


Thanks,
pq