[4/5] Apply missing fixes from upstream

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index fbcc25d1d40e5b7dd2802aa023238b31047a0ff2..b7cae64e553930df7261a5a7704fdf580ac3b952 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -121,7 +121,7 @@ CLEANFILES = $(BUILT_SOURCES) \
 AM_CPPFLAGS = \
        -include $(top_builddir)/config.h \
        -DPKGSYSCONFDIR=\"$(pkgsysconfdir)\" \
-       -DELOGIND_CGROUP_CONTROLLER=\"$(CGROUP_CONTROLLER)\" \
+       -DSYSTEMD_CGROUP_CONTROLLER=\"$(CGROUP_CONTROLLER)\" \
        -DELOGIND_CGROUP_AGENT_PATH=\"$(pkglibexecdir)/elogind-cgroups-agent\" \
        -DUDEVLIBEXECDIR=\"$(udevlibexecdir)\" \
        -DPOLKIT_AGENT_BINARY_PATH=\"$(PKTTYAGENT)\" \
@@ -623,7 +623,9 @@ libelogind_core_la_SOURCES = \
        src/login/logind-utmp.c \
        src/login/logind-acl.h \
        src/core/cgroup.h \
-       src/core/cgroup.c
+       src/core/cgroup.c \
+       src/core/mount-setup.h \
+       src/core/mount-setup.c
 
 libelogind_core_la_LIBADD = \
        libshared.la
@@ -729,6 +731,8 @@ pamlib_LTLIBRARIES = \
 dist_pamconf_DATA = \
        src/login/elogind-user
 
+EXTRA_DIST += \
+       src/login/elogind-user.m4
 endif
 
 dist_dbussystemservice_DATA += \