mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager
synced 2024-10-15 20:45:32 +00:00
build: don't abort configure if there's no systemd devel headers
Just disable systemd-logind session tracking instead.
This commit is contained in:
parent
b9b7bb1958
commit
e486a3803d
13
configure.ac
13
configure.ac
|
@ -364,12 +364,19 @@ AS_IF([test "$with_session_tracking" = "none"], [use_consolekit="no" use_systemd
|
||||||
AS_IF([test -n "$with_systemd_logind" ], [use_systemd_logind="$with_systemd_logind"])
|
AS_IF([test -n "$with_systemd_logind" ], [use_systemd_logind="$with_systemd_logind"])
|
||||||
AS_IF([test -n "$with_consolekit" ], [use_consolekit="$with_consolekit"])
|
AS_IF([test -n "$with_consolekit" ], [use_consolekit="$with_consolekit"])
|
||||||
# defaults
|
# defaults
|
||||||
AS_IF([test -z "$use_systemd_logind"], [use_systemd_logind="yes"])
|
AS_IF([test -z "$use_systemd_logind"], [use_systemd_logind="auto"])
|
||||||
AS_IF([test -z "$use_consolekit"], [use_consolekit="yes"])
|
AS_IF([test -z "$use_consolekit"], [use_consolekit="yes"])
|
||||||
# output
|
# output
|
||||||
session_tracking=
|
session_tracking=
|
||||||
if test "$use_systemd_logind" = "yes"; then
|
if test "$use_systemd_logind" = "yes" -o "$use_systemd_logind" = "auto"; then
|
||||||
PKG_CHECK_MODULES(SYSTEMD_LOGIN, [libsystemd], , [PKG_CHECK_MODULES(SYSTEMD_LOGIN, [libsystemd-login])])
|
PKG_CHECK_MODULES(SYSTEMD_LOGIN, [libsystemd], [have_systemd_logind=yes], [PKG_CHECK_MODULES(SYSTEMD_LOGIN, [libsystemd-login], [have_systemd_logind=yes], [have_systemd_logind=no])])
|
||||||
|
else
|
||||||
|
have_systemd_logind=no
|
||||||
|
fi
|
||||||
|
if test "$use_systemd_logind" = "yes" -a "$have_systemd_logind" = "no"; then
|
||||||
|
AC_MSG_ERROR([You must have libsystemd installed to build with systemd-logind support.])
|
||||||
|
fi
|
||||||
|
if test "$have_systemd_logind" = "yes"; then
|
||||||
AC_SUBST(SYSTEMD_LOGIN_CFLAGS)
|
AC_SUBST(SYSTEMD_LOGIN_CFLAGS)
|
||||||
AC_SUBST(SYSTEMD_LOGIN_LIBS)
|
AC_SUBST(SYSTEMD_LOGIN_LIBS)
|
||||||
AC_DEFINE([SESSION_TRACKING_SYSTEMD], 1, [Define to 1 if libsystemd-login is available])
|
AC_DEFINE([SESSION_TRACKING_SYSTEMD], 1, [Define to 1 if libsystemd-login is available])
|
||||||
|
|
Loading…
Reference in a new issue