m4/ltversion.m4
EXTRA_DIST = \
+m4/pkg_var.m4 \
m4/ac_path_generic.m4 \
m4/ecore_check_c_extension.m4 \
m4/ecore_check_module.m4 \
dbus-services/org.enlightenment.Efreet.service \
dbus-services/org.enlightenment.Ethumb.service
+if HAVE_SYSTEMD_USER_SESSION
+systemdunitsdir = @USER_SESSION_DIR@
+systemdunits_DATA = \
+systemd-services/efreet.service \
+systemd-services/ethumb.service
+endif
+EXTRA_DIST += $(systemdunits_DATA)
.PHONY: doc benchmark examples install-examples
want_systemd="no"
])
+systemd_dbus_prefix="# "
+if test "${want_systemd}" = "yes"; then
+ systemd_dbus_prefix=""
+fi
+AC_SUBST(systemd_dbus_prefix)
+
+AC_ARG_WITH([systemdunitdir],
+ AC_HELP_STRING([--with-systemdunitdir=DIR],
+ [path to systemd user services directory]),
+ [USER_SESSION_DIR=${withval}])
+if test "$want_systemd" == "no"; then
+ have_systemd_user_session="no"
+elif test -n "${USER_SESSION_DIR}"; then
+ have_systemd_user_session="yes"
+ AC_MSG_NOTICE([Using systemd user services directory as ${USER_SESSION_DIR}])
+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])
+
+
if test "x${have_systemd_pkg}" = "xauto" -o "x${have_systemd_pkg}" = "xyes"; then
PKG_CHECK_MODULES([SYSTEMD], [libsystemd-daemon >= 192 libsystemd-journal >= 192],
[have_systemd_pkg="yes"],
pc/ethumb_client.pc
dbus-services/org.enlightenment.Efreet.service
dbus-services/org.enlightenment.Ethumb.service
+systemd-services/efreet.service
+systemd-services/ethumb.service
$po_makefile_in
cmakeconfig/EinaConfig.cmake
cmakeconfig/EinaConfigVersion.cmake:cmakeconfig/EFLConfigVersion.cmake.in
echo " "
echo "Installation....: make install (as root if needed, with 'su' or 'sudo')"
echo " prefix........: $prefix"
+echo " dbus units....: $dbusservicedir"
+if test "${have_systemd_user_session}" = "yes"; then
+echo " systemd units.: $USER_SESSION_DIR"
+fi
echo
if test "x${have_systemd_pkg}" = "xyes" -a "x${want_systemd}" = "xno"; then
--- /dev/null
+# PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE,
+# [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
+# -------------------------------------------
+# Retrieves the value of the pkg-config variable for the given module.
+AC_DEFUN([EFL_PKG_CHECK_VAR],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl
+
+_PKG_CONFIG([$1], [variable="][$3]["], [$2])
+AS_VAR_COPY([$1], [pkg_cv_][$1])
+
+AS_VAR_IF([$1], [""], [$5], [$4])dnl
+])# PKG_CHECK_VAR
+