Commit b8f32619 authored by David Zeuthen's avatar David Zeuthen

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: 's avatarDavid Zeuthen <davidz@redhat.com>
parent 1724ece5
......@@ -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
......
......@@ -81,7 +81,7 @@ libpolkit_gobject_1_la_SOURCES = \
polkitpermission.c polkitpermission.h \
$(NULL)
if HAVE_SYSTEMD
if HAVE_LIBSYSTEMD_LOGIN
libpolkit_gobject_1_la_SOURCES += \
polkitunixsession-systemd.c polkitunixsession.h
else
......@@ -92,12 +92,12 @@ endif
libpolkit_gobject_1_la_CFLAGS = \
-D_POLKIT_COMPILATION \
$(GLIB_CFLAGS) \
$(SYSTEMD_CFLAGS) \
$(LIBSYSTEMD_LOGIN_CFLAGS) \
$(NULL)
libpolkit_gobject_1_la_LIBADD = \
$(GLIB_LIBS) \
$(SYSTEMD_LIBS) \
$(LIBSYSTEMD_LOGIN_LIBS) \
$(NULL)
libpolkit_gobject_1_la_LDFLAGS = -export-symbols-regex '(^polkit_.*)'
......
......@@ -52,7 +52,7 @@ libpolkit_backend_1_la_SOURCES = \
polkitbackendlocalauthorizationstore.h polkitbackendlocalauthorizationstore.c \
$(NULL)
if HAVE_SYSTEMD
if HAVE_LIBSYSTEMD_LOGIN
libpolkit_backend_1_la_SOURCES += \
polkitbackendsessionmonitor.h polkitbackendsessionmonitor-systemd.c
else
......@@ -64,13 +64,13 @@ libpolkit_backend_1_la_CFLAGS = \
-D_POLKIT_COMPILATION \
-D_POLKIT_BACKEND_COMPILATION \
$(GLIB_CFLAGS) \
$(SYSTEMD_CFLAGS) \
$(LIBSYSTEMD_LOGIN_CFLAGS) \
$(LIBJS_CFLAGS) \
$(NULL)
libpolkit_backend_1_la_LIBADD = \
$(GLIB_LIBS) \
$(SYSTEMD_LIBS) \
$(LIBSYSTEMD_LOGIN_LIBS) \
$(top_builddir)/src/polkit/libpolkit-gobject-1.la \
$(EXPAT_LIBS) \
$(LIBJS_LIBS) \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment