From b8f326194efab5feac819079ca9abb0b9f477103 Mon Sep 17 00:00:00 2001 From: David Zeuthen Date: Wed, 23 May 2012 15:53:35 -0400 Subject: Rename --enable-systemd to --enable-libsystemd-login It's useful to be more specific because we also want an option to install a systemd .service file which you may not want even if you are using libsystemd-login... Signed-off-by: David Zeuthen --- configure.ac | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 7b7f3eb..2712e19 100644 --- a/configure.ac +++ b/configure.ac @@ -152,33 +152,33 @@ if test "x$GCC" = "xyes"; then fi dnl --------------------------------------------------------------------------- -dnl - Select wether to use systemd or ConsoleKit for session tracking +dnl - Select wether to use libsystemd-login or ConsoleKit for session tracking dnl --------------------------------------------------------------------------- -have_systemd=no +have_libsystemd_login=no SESSION_TRACKING=ConsoleKit -AC_ARG_ENABLE([systemd], - AS_HELP_STRING([--enable-systemd[=@<:@auto/yes/no@:>@]], [Use systemd (auto/yes/no)]), - [enable_systemd=$enableval], - [enable_systemd=auto]) -if test "$enable_systemd" != "no"; then - PKG_CHECK_MODULES(SYSTEMD, +AC_ARG_ENABLE([libsystemd-login], + AS_HELP_STRING([--enable-libsystemd-login[=@<:@auto/yes/no@:>@]], [Use libsystemd-login (auto/yes/no)]), + [enable_libsystemd_login=$enableval], + [enable_libsystemd_login=auto]) +if test "$enable_libsystemd_login" != "no"; then + PKG_CHECK_MODULES(LIBSYSTEMD_LOGIN, [libsystemd-login], - have_systemd=yes, - have_systemd=no) - if test "$have_systemd" = "yes"; then - SESSION_TRACKING=systemd + have_libsystemd_login=yes, + have_libsystemd_login=no) + if test "$have_libsystemd_login" = "yes"; then + SESSION_TRACKING=libsystemd-login else - if test "$enable_systemd" = "yes"; then - AC_MSG_ERROR([systemd support requested but libsystemd-login1 library not found]) + if test "$enable_libsystemd_login" = "yes"; then + AC_MSG_ERROR([libsystemd-login support requested but libsystemd-login library not found]) fi fi fi -AC_SUBST(SYSTEMD_CFLAGS) -AC_SUBST(SYSTEMD_LIBS) -AM_CONDITIONAL(HAVE_SYSTEMD, [test "$have_systemd" = "yes"], [Using systemd]) +AC_SUBST(LIBSYSTEMD_LOGIN_CFLAGS) +AC_SUBST(LIBSYSTEMD_LOGIN_LIBS) +AM_CONDITIONAL(HAVE_LIBSYSTEMD_LOGIN, [test "$have_libsystemd_login" = "yes"], [Using libsystemd-login]) dnl --------------------------------------------------------------------------- dnl - Select which authentication framework to use -- cgit v1.2.3