colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

build: clean up --with-session-tracking

Browse Source
This commit is contained in:
Pavel Šimerda
2012-11-23 22:01:25 +01:00
parent f41f41506c
commit 13b8301fda
1 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
configure.ac
View File

@@ -270,27 +270,27 @@ if test "$with_systemdsystemunitdir" != no; then
AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir]) AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir])
fi fi
AC_ARG_WITH(session-tracking, AS_HELP_STRING([--with-session-tracking=systemd|ck|none], [Build NetworkManager with specific session tracking support])) # session tracking support
if test "z$with_session_tracking" = "z"; then AC_ARG_WITH(session-tracking, AS_HELP_STRING([--with-session-tracking=systemd|consolekit|no],
# Default to ConsoleKit session tracking like we used before [Select session tracking support (default: consolekit)]))
with_session_tracking=ck # default to consolekit
fi AS_IF([test -z "$with_session_tracking"], with_session_tracking=consolekit)
AS_IF([test "$with_session_tracking" = "ck"], with_session_tracking=consolekit)
case $with_session_tracking in AS_IF([test "$with_session_tracking" = "none"], with_session_tracking=no)
ck|none|no) ;; # check value
systemd) AS_IF([!echo "$with_session_tracking" | grep -E "^(systemd|consolekit|no)$"],
AC_MSG_ERROR([--with-session-tracking must be systemd/consolekit/no, not $with_session_tracking]))
# add conditionals and subtitutions
AM_CONDITIONAL(SESSION_TRACKING_CK, test "$with_session_tracking" = "consolekit")
AM_CONDITIONAL(SESSION_TRACKING_SYSTEMD, test "xwith_session_tracking" = "systemd")
if test "$with_session_tracking" = "systemd"; then
PKG_CHECK_MODULES(SYSTEMD_LOGIN, [libsystemd-login]) PKG_CHECK_MODULES(SYSTEMD_LOGIN, [libsystemd-login])
;;
*)
AC_MSG_ERROR(--with-session-tracking must be one of [none, ck, systemd])
;;
esac
AC_SUBST(SYSTEMD_LOGIN_CFLAGS) AC_SUBST(SYSTEMD_LOGIN_CFLAGS)
AC_SUBST(SYSTEMD_LOGIN_LIBS) AC_SUBST(SYSTEMD_LOGIN_LIBS)
fi
if test "with_session_tracking" = "consolekit"; then
AC_SUBST(CKDB_PATH, /var/run/ConsoleKit/database) AC_SUBST(CKDB_PATH, /var/run/ConsoleKit/database)
AM_CONDITIONAL(SESSION_TRACKING_CK, test "x$with_session_tracking" = "xck") fi
AM_CONDITIONAL(SESSION_TRACKING_SYSTEMD, test "x$with_session_tracking" = "xsystemd")
AC_ARG_WITH(suspend-resume, AS_HELP_STRING([--with-suspend-resume=upower|systemd], [Build NetworkManager with specific suspend/resume support])) AC_ARG_WITH(suspend-resume, AS_HELP_STRING([--with-suspend-resume=upower|systemd], [Build NetworkManager with specific suspend/resume support]))
if test "z$with_suspend_resume" = "z"; then if test "z$with_suspend_resume" = "z"; then