diff options
| author | Gustavo Sverzut Barbieri <barbieri@profusion.mobi> | 2013-08-09 21:29:18 -0300 |
|---|---|---|
| committer | Gustavo Sverzut Barbieri <barbieri@profusion.mobi> | 2013-08-22 09:43:40 -0300 |
| commit | 5bdba47e8455bce33f6bef66e487cbd29411d088 (patch) | |
| tree | 59c907c0ed34361132a0019689f11b3434b76a53 | |
| parent | 879a260ea54a3cd4638ec7fad5546b18201ee441 (diff) | |
| download | enlightenment-5bdba47e8455bce33f6bef66e487cbd29411d088.tar.gz | |
generate e18.service using prefix, allows disabling systemd.
If one have systemd but installs to ~/ (no root) then installing
e18.service hurts.
Have e18.service to be generated using @prefix@ so it won't hardcode
to /usr/bin, removing "-locked" as that can be configured in the GUI
and in some cases you just want your e18 without lock/password.
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | configure.ac | 18 | ||||
| -rw-r--r-- | data/units/e18.service.in (renamed from data/units/e18.service) | 2 |
3 files changed, 18 insertions, 3 deletions
diff --git a/.gitignore b/.gitignore index 36b178ae9d..68dddf0963 100644 --- a/.gitignore +++ b/.gitignore @@ -43,3 +43,4 @@ default.edj /missing /mkinstalldirs /stamp-h1 +/data/units/e18.service diff --git a/configure.ac b/configure.ac index b8e0e514b7..19149633f5 100644 --- a/configure.ac +++ b/configure.ac @@ -205,9 +205,22 @@ if test "x${have_bluetooth}" = "xyes"; then AC_DEFINE_UNQUOTED([HAVE_BLUETOOTH], [1], [Bluetooth is there]) fi -# Detect systemd user session directory properly -EFL_PKG_CHECK_VAR([USER_SESSION_DIR], [systemd >= 192], [systemduserunitdir], +AC_ARG_ENABLE([systemd], + AC_HELP_STRING([--disable-systemd], [disable systemd support @<:@default=detect@:>@]), + [want_systemd=${enableval}], [want_systemd=auto]) + +if test "$want_systemd" == "no"; then + have_systemd_user_session="no" +else + # Detect systemd user session directory properly + EFL_PKG_CHECK_VAR([USER_SESSION_DIR], [systemd >= 192], [systemduserunitdir], [have_systemd_user_session="yes"], [have_systemd_user_session="no"]) + + if test "$want_systemd" = "yes" -a "$have_systemd_user_session" = "no"; then + AC_MSG_ERROR([systemd support wanted, but systemd was not found.]) + fi +fi + AM_CONDITIONAL([HAVE_SYSTEMD_USER_SESSION], [test "x${have_systemd_user_session}" = "xyes"]) AC_SUBST([USER_SESSION_DIR]) @@ -1054,6 +1067,7 @@ data/etc/sysactions.conf data/icons/Makefile data/backgrounds/Makefile data/units/Makefile +data/units/e18.service doc/Makefile doc/Doxyfile doc/e.dox diff --git a/data/units/e18.service b/data/units/e18.service.in index ad413b988d..1ae007bc68 100644 --- a/data/units/e18.service +++ b/data/units/e18.service.in @@ -12,7 +12,7 @@ AllowIsolate=true Type=notify #Environment=PATH=uncomment:to:override:your:PATH Environment=E_START=enlightenment -ExecStart=/usr/bin/enlightenment -locked +ExecStart=@prefix@/bin/enlightenment Restart=always RestartPreventExitStatus=0 RestartSec=2 |