old
/
entrance
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

entrance: fix systemd check

This commit is contained in:
Michael Bouchaud 2014-02-07 01:43:41 +00:00
parent f17a3c2d90
commit 8706feaa23
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
configure.ac
View File

@ -87,22 +87,18 @@ AC_MSG_RESULT([${enable_consolekit}])
# systemd # systemd
AC_ARG_ENABLE([systemd], AC_ARG_ENABLE([systemd],
[AC_HELP_STRING([--disable-systemd], [AC_HELP_STRING([--disable-systemd],
[Enable systemd support. @<:@default=enabled@:>@])], [Disable systemd support. @<:@default=enabled@:>@])],
[ [
if test "x${enableval}" = "xyes" ; then if test "x${enableval}" = "xyes" ; then
want_systemd="yes" enable_systemd="yes"
else else
want_systemd="no" enable_systemd="no"
fi fi
], ],
[want_systemd="yes"]) [enable_systemd="yes"])
if test "x${enableval}" = "xyes" ; then AC_MSG_CHECKING([whether to support systemd init])
PKG_CHECK_MODULES([SYSTEMD], [systemd >= 192], AC_MSG_RESULT([${enable_systemd}])
[want_systemd="yes"],
[want_systemd="no"])
fi
### Checks for programs ### Checks for programs
AC_PROG_CC AC_PROG_CC
PKG_PROG_PKG_CONFIG PKG_PROG_PKG_CONFIG
@ -159,9 +155,13 @@ if test "x${enable_pam}" = "xyes" ; then
[have_pam="no"]) [have_pam="no"])
fi fi
#systemd # Systemd
AM_CONDITIONAL([WANT_SYSTEMD], [test "${want_systemd}" = "yes"]) AM_CONDITIONAL(HAVE_SYSTEMD, [test "x${enable_systemd}" = "xyes"])
if test "x${enableval}" = "xyes" ; then
PKG_CHECK_MODULES([HAVE_SYSTEMD], [systemd >= 192],
[enable_systemd="yes"],
[enable_systemd="no"])
fi
### Checks for header files ### Checks for header files
@ -221,7 +221,7 @@ echo " pam..................: ${have_pam}"
echo " grub2................: ${enable_grub2}" echo " grub2................: ${enable_grub2}"
echo " ekbd.................: ${enable_ekbd}" echo " ekbd.................: ${enable_ekbd}"
echo " consolekit...........: ${enable_consolekit}" echo " consolekit...........: ${enable_consolekit}"
echo " systemd..............: ${want_systemd}" echo " systemd..............: ${enable_systemd}"
echo echo
echo " edje_cc..............: ${edje_cc}" echo " edje_cc..............: ${edje_cc}"
echo echo

2
data/Makefile.am
View File

@ -9,7 +9,7 @@ pam_DATA = entrance
confdir = $(sysconfdir) confdir = $(sysconfdir)
conf_DATA = entrance.conf conf_DATA = entrance.conf
if WANT_SYSTEMD if HAVE_SYSTEMD
systemddir = /usr/lib/systemd/system/ systemddir = /usr/lib/systemd/system/
systemd_DATA = entrance.service systemd_DATA = entrance.service
endif endif