diff options
| -rw-r--r-- | configure.ac | 14 | ||||
| -rw-r--r-- | data/Makefile.am | 4 |
2 files changed, 15 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index 6bbb300..ac4b7c4 100644 --- a/configure.ac +++ b/configure.ac @@ -50,8 +50,18 @@ PKG_CHECK_MODULES(INDICATOR, glib-2.0 >= $GLIB_REQUIRED_VERSION dbusmenu-gtk3-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION) PKG_CHECK_MODULES(APPINDICATOR, ayatana-appindicator3-0.1 >= $LIBAPPINDICATOR_REQUIRED_VERSION) -SYSTEMD_USERDIR=`$PKG_CONFIG --variable=systemduserunitdir systemd` -AC_SUBST(SYSTEMD_USERDIR) +######################### +# Check for systemd +######################### +PKG_CHECK_MODULES(SYSTEMD, systemd, + [has_systemd=yes], + [] +) +if test "x$has_systemd" = "xyes"; then + SYSTEMD_USERDIR=`$PKG_CONFIG --variable=systemduserunitdir systemd` + AC_SUBST(SYSTEMD_USERDIR) + AC_DEFINE(HAVE_SYSTEMD, 1, [create ayatana-indicator-application.service for systemd]) +fi ########################### # gcov coverage reporting diff --git a/data/Makefile.am b/data/Makefile.am index f7cc652..96abc17 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -16,11 +16,13 @@ xdg_autostart_DATA = ayatana-indicator-application.desktop overridedir = $(pkgdatadir) override_DATA = ordering-override.keyfile +#if defined(HAVE_SYSTEMD) %.service: %.service.in $(AM_V_GEN) sed -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" $< > $@ - + systemddir = $(SYSTEMD_USERDIR) systemd_DATA = ayatana-indicator-application.service +#endif upstartsystemdoverridedir = $(datadir)/upstart/systemd-session/upstart upstartsystemdoverride_DATA = ayatana-indicator-application.override |