On Mon, 28 Sep 2015 00:30:10 +0200 Frederico Cadete <[email protected]> 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 <[email protected]> I tested this on a system without logind, so in any case: Tested-by: Pekka Paalanen <[email protected]> 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])])
pgpCnQe1hPwVX.pgp
Description: OpenPGP digital signature
_______________________________________________ wayland-devel mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/wayland-devel
