[PATCH weston v2 1/2] configure.ac: add support for new versions of systemd

[Derek Foreman]

On 27/09/15 05:30 PM, Frederico Cadete wrote:
> Starting from systemd version 209, a single libsystemd.pc is provided.
> For previous versions, fall back on libsystemd-login.pc.

Hmm, on my debian box I have libsystemd.pc and libsystemd-login.pc
They have different versions (226 and 225)

Ugh, libsystemd-login.pc has a comment that it's deprecated.

So your patch actually gets the correct version for logind, where
previously it didn't.  Nice.

Reviewed-by: Derek Foreman <derekf at osg.samsung.com>

> Signed-off-by: Frederico Cadete <frederico at cadete.eu>
> ---
>  configure.ac | 17 +++++++++++++----
>  1 file changed, 13 insertions(+), 4 deletions(-)
> 
> diff --git a/configure.ac b/configure.ac
> index 045291c..a9cd429 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -380,14 +380,23 @@ AC_ARG_ENABLE(resize-optimization,
>  AS_IF([test "x$enable_resize_optimization" = "xyes"],
>        [AC_DEFINE([USE_RESIZE_POOL], [1], [Use resize memory pool as a performance optimization])])
>  
> -PKG_CHECK_MODULES(SYSTEMD_LOGIN, [libsystemd-login >= 198],
> -                  [have_systemd_login=yes], [have_systemd_login=no])
> +PKG_CHECK_MODULES(SYSTEMD_LOGIN,
> +                  [libsystemd >= 209],
> +                  [have_systemd_login_209=yes;have_systemd_login=yes],
> +                  [have_systemd_login_209=no;have_systemd_login=no])
> +
> +# Older versions of systemd package systemd-login separately. Fall back on that
> +AS_IF([test x$have_systemd_login != xyes],[
> +      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])])
>  
>