[PATCH weston v2 2/2] configure.ac: add explicit enable/disable for systemd-login support

[Bryce Harrington]

On Tue, Sep 29, 2015 at 10:28:03AM +0300, Pekka Paalanen wrote:
> On Mon, 28 Sep 2015 00:30:10 +0200
> Frederico Cadete <frederico at cadete.eu> wrote:
> 
> > Otherwise, auto-enable depending on whether the system has the necessary
> > libraries.
> > ---
> >  configure.ac | 36 ++++++++++++++++++++++++------------
> >  1 file changed, 24 insertions(+), 12 deletions(-)
> > 
> > diff --git a/configure.ac b/configure.ac
> > index a9cd429..3b317c2 100644
> > --- a/configure.ac
> > +++ b/configure.ac
> > @@ -380,18 +380,30 @@ 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 >= 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])
> > -      ])
> > +AC_ARG_ENABLE(systemd-login,
> > +              AS_HELP_STRING([--enable-systemd-login],
> > +                             [Enable systemd-logind support in weston-launch]),,
> 
> Hi,
> 
> I think a more correct help text would be: "Enable logind support".
> It's not only weston-launch; the usual use case is running simply
> 'weston' on a system with logind support, making weston-launch
> unnecessary but still ok to use.
> 
> If you fix that, you can put
> Reviewed-by: Pekka Paalanen <pekka.paalanen at collabora.co.uk>
> 
> I tested this on a system without logind, so in any case:
> Tested-by: Pekka Paalanen <pekka.paalanen at collabora.co.uk>

I made the suggested help text change locally and pushed the patch:

To ssh://git.freedesktop.org/git/wayland/weston
   94fd9a5..8e1efcd  master -> master


> Thanks,
> pq
> 
> > +              enable_systemd_login=auto)
> > +if test x$enable_systemd_login != xno; then
> > +  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])
> > +        ])
> > +else
> > +  have_systemd_login=no
> > +fi
> > +
> > +if test "x$have_systemd_login" = "xno" -a "x$enable_systemd_login" = "xyes"; then
> > +  AC_MSG_ERROR([systemd-login support explicitly enabled, but can't find libsystemd>=209 or libsystemd-login])
> > +fi
> >  
> >  AS_IF([test "x$have_systemd_login" = "xyes"],
> >        [AC_DEFINE([HAVE_SYSTEMD_LOGIN], [1], [Have systemd-login])])
> 

> -----BEGIN PGP SIGNATURE-----
> Version: GnuPG v2
> 
> iQIVAwUBVgo9iiNf5bQRqqqnAQiUSw//S9kfitraPbsBhXVG41R1R1lZPdlhzEKE
> wgTAh70lXD1KHqlkLn/JLZFkgBIWv8nb+jsgnUTV51YUSaaNkFU0wjXu0TQIEVbF
> r/JDt5JmpC0Xyh5hAW+Rg0ZjYXPqfyQTn+ngatkiz0zpOvFW9ywIv9dc3O5SdFqi
> yIJEoxtn5/BDcoiSzF25/ZWoy7kuYSXXXP8lm1o9i/EYtADbQCdGpFhp/6Nlyf8Q
> pJkxRvwnACh/dhl9dOghbwUBLymi7y/O/WxrcN9rIThaKyNkHMZ+1uPEml797hGe
> krZdKj+h2HEmZTCLT8fcBMnwPFUJyPpCsxUuK3yz7WS6J6QybNFyMDQ5wjhNTVzg
> +okft5om6voUKiG0/W2ahDcHjGlj9cpTNH4pqacE+zn4vSpR8pqTdXqKa+DMq0Ok
> Xp/X+RqGFHy6i9hJVks4tfzyN4oYfS4AIfP5wV1eQtdAvRU4/gONzJJErXVS1GJ6
> tEaaUTCGvk68SUoer6KKyDfANx4dcwkxYJj1pElSIQBfUHtYrk/s2l5xNiSKiKF1
> Rxq6+PUFY1WMiz9ZgeLTdtfhG9rbjCGpN/Xlpr/bjF3AO23aaLJSBIXlF0XLqxFC
> RLL67Uib2LW3TqKjII1E2B1jlQkHVxsu4OuHRzKeO4HNkpM6OOC9n9Br6xDRSKB1
> yJs4DMns36Y=
> =LTqT
> -----END PGP SIGNATURE-----