From: Auke Kok <auke-jan.h.kok@intel.com>
Date: Fri, 22 Jun 2012 06:19:54 +0000 (-0700)
Subject: enlightenment: Add units for e17.
X-Git-Tag: v1~7
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0c12556f89a3e4e3f5ebd68b3cab0e799211990e;p=platform%2Fupstream%2Fuser-session-units.git

enlightenment: Add units for e17.

These are installed conditionally - when E is present, only.
---

diff --git a/Makefile.am b/Makefile.am
index c2c8d60..b9d3c9f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,3 +9,9 @@ systemduserunit_DATA = \
 	units/user/dbus.socket \
 	units/user/dbus.service
 
+if HAVE_E
+systemduserunit_DATA += \
+	units/user/e17.target \
+	units/user/enlightenment.service
+endif
+
diff --git a/configure.ac b/configure.ac
index 9d2cdcf..fa2b275 100644
--- a/configure.ac
+++ b/configure.ac
@@ -16,6 +16,16 @@ AC_SUBST(SYSTEMDUSERUNITDIR)
 SYSTEMDUTILDIR="`$PKG_CONFIG --variable=systemdutildir systemd`"
 AC_SUBST(SYSTEMDUTILDIR)
 
+# test for xorg-launch-helper
+AC_MSG_CHECKING(for xorg-launch-helper)
+if test -f "$SYSTEMDUSERUNITDIR/xorg.target" ; then
+  result=yes
+else
+  AC_ERROR([xorg-launch-helper is required for most of the units])
+  result=no
+fi
+AC_MSG_RESULT($result)
+
 # Check for dbus daemon path for the session bus
 PKG_CHECK_MODULES([DBUS], [dbus-1])
 
@@ -24,8 +34,18 @@ DBUSPREFIX="`$PKG_CONFIG --variable=prefix dbus-1`"
 AC_SUBST(DBUSDAEMONDIR)
 AC_SUBST(DBUSPREFIX)
 
+# these are the desktops:
+PKG_CHECK_MODULES([ENLIGHTENMENT], [enlightenment],
+  EPREFIX="`$PKG_CONFIG --variable=exec_prefix enlightenment`"
+  AC_SUBST(EPREFIX),
+  true
+)
+AM_CONDITIONAL([HAVE_E], [test x$EPREFIX != x])
+
 AC_OUTPUT([
 units/system/user-session@.service
 units/user/dbus.socket
 units/user/dbus.service
+units/user/e17.target
+units/user/enlightenment.service
 ])
diff --git a/units/user/e17.target b/units/user/e17.target.in
similarity index 100%
rename from units/user/e17.target
rename to units/user/e17.target.in
diff --git a/units/user/enlightenment.service b/units/user/enlightenment.service.in
similarity index 70%
rename from units/user/enlightenment.service
rename to units/user/enlightenment.service.in
index f975244..21fd54f 100644
--- a/units/user/enlightenment.service
+++ b/units/user/enlightenment.service.in
@@ -5,5 +5,5 @@ After=xorg.target
 Requires=dbus.socket
 
 [Service]
-ExecStart=/usr/bin/enlightenment_start
+ExecStart=@EPREFIX@/bin/enlightenment_start