barbieri pushed a commit to branch master.
commit 5bdba47e8455bce33f6bef66e487cbd29411d088
Author: Gustavo Sverzut Barbieri <[email protected]>
Date: Fri Aug 9 21:29:18 2013 -0300
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.
---
.gitignore | 1 +
configure.ac | 18 ++++++++++++++++--
data/units/{e18.service => e18.service.in} | 2 +-
3 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/.gitignore b/.gitignore
index 36b178a..68dddf0 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 b8e0e51..1914963 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
similarity index 92%
rename from data/units/e18.service
rename to data/units/e18.service.in
index ad413b9..1ae007b 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
--
------------------------------------------------------------------------------
Introducing Performance Central, a new site from SourceForge and
AppDynamics. Performance Central is your source for news, insights,
analysis and resources for efficient Application Performance Management.
Visit us today!
http://pubads.g.doubleclick.net/gampad/clk?id=48897511&iu=/4140/ostg.clktrk
