summaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac35
1 files changed, 35 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac
index 754ad09b3f..d30d7220ef 100644
--- a/configure.ac
+++ b/configure.ac
@@ -587,6 +587,35 @@ AC_ARG_ENABLE([systemd],
587 want_systemd="no" 587 want_systemd="no"
588 ]) 588 ])
589 589
590systemd_dbus_prefix="# "
591if test "${want_systemd}" = "yes"; then
592 systemd_dbus_prefix=""
593fi
594AC_SUBST(systemd_dbus_prefix)
595
596AC_ARG_WITH([systemdunitdir],
597 AC_HELP_STRING([--with-systemdunitdir=DIR],
598 [path to systemd user services directory]),
599 [USER_SESSION_DIR=${withval}])
600if test "$want_systemd" == "no"; then
601 have_systemd_user_session="no"
602elif test -n "${USER_SESSION_DIR}"; then
603 have_systemd_user_session="yes"
604 AC_MSG_NOTICE([Using systemd user services directory as ${USER_SESSION_DIR}])
605else
606 # Detect systemd user session directory properly
607 EFL_PKG_CHECK_VAR([USER_SESSION_DIR], [systemd >= 192], [systemduserunitdir],
608 [have_systemd_user_session="yes"], [have_systemd_user_session="no"])
609
610 if test "$want_systemd" = "yes" -a "$have_systemd_user_session" = "no"; then
611 AC_MSG_ERROR([systemd support wanted, but systemd was not found.])
612 fi
613fi
614
615AM_CONDITIONAL([HAVE_SYSTEMD_USER_SESSION], [test "x${have_systemd_user_session}" = "xyes"])
616AC_SUBST([USER_SESSION_DIR])
617
618
590if test "x${have_systemd_pkg}" = "xauto" -o "x${have_systemd_pkg}" = "xyes"; then 619if test "x${have_systemd_pkg}" = "xauto" -o "x${have_systemd_pkg}" = "xyes"; then
591 PKG_CHECK_MODULES([SYSTEMD], [libsystemd-daemon >= 192 libsystemd-journal >= 192], 620 PKG_CHECK_MODULES([SYSTEMD], [libsystemd-daemon >= 192 libsystemd-journal >= 192],
592 [have_systemd_pkg="yes"], 621 [have_systemd_pkg="yes"],
@@ -4105,6 +4134,8 @@ pc/ethumb.pc
4105pc/ethumb_client.pc 4134pc/ethumb_client.pc
4106dbus-services/org.enlightenment.Efreet.service 4135dbus-services/org.enlightenment.Efreet.service
4107dbus-services/org.enlightenment.Ethumb.service 4136dbus-services/org.enlightenment.Ethumb.service
4137systemd-services/efreet.service
4138systemd-services/ethumb.service
4108$po_makefile_in 4139$po_makefile_in
4109cmakeconfig/EinaConfig.cmake 4140cmakeconfig/EinaConfig.cmake
4110cmakeconfig/EinaConfigVersion.cmake:cmakeconfig/EFLConfigVersion.cmake.in 4141cmakeconfig/EinaConfigVersion.cmake:cmakeconfig/EFLConfigVersion.cmake.in
@@ -4250,6 +4281,10 @@ fi
4250echo " " 4281echo " "
4251echo "Installation....: make install (as root if needed, with 'su' or 'sudo')" 4282echo "Installation....: make install (as root if needed, with 'su' or 'sudo')"
4252echo " prefix........: $prefix" 4283echo " prefix........: $prefix"
4284echo " dbus units....: $dbusservicedir"
4285if test "${have_systemd_user_session}" = "yes"; then
4286echo " systemd units.: $USER_SESSION_DIR"
4287fi
4253echo 4288echo
4254 4289
4255if test "x${have_systemd_pkg}" = "xyes" -a "x${want_systemd}" = "xno"; then 4290if test "x${have_systemd_pkg}" = "xyes" -a "x${want_systemd}" = "xno"; then