chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'harald/master'
[elogind.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index 4acdb2e7fb901d15498ed8b8478cf30f4d4fb361..ca2c43773aa05ec08eb4d6cd69749657787ae9be 100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-885,7
+885,6
@@
systemd_logind_SOURCES = \
src/logind-session-dbus.c \
src/logind-user.c \
src/logind-user-dbus.c \
src/logind-session-dbus.c \
src/logind-user.c \
src/logind-user-dbus.c \
- src/logind-acl.c \
src/dbus-common.c \
src/dbus-loop.c \
src/cgroup-util.c \
src/dbus-common.c \
src/dbus-loop.c \
src/cgroup-util.c \
@@
-905,8
+904,15
@@
systemd_logind_LDADD = \
$(ACL_LIBS)
systemd_uaccess_SOURCES = \
$(ACL_LIBS)
systemd_uaccess_SOURCES = \
- src/uaccess.c \
- src/logind-acl.c
+ src/uaccess.c
+
+if HAVE_ACL
+systemd_logind_SOURCES += \
+ src/logind-acl.c
+
+systemd_uaccess_SOURCES += \
+ src/logind-acl.c
+endif
systemd_uaccess_CFLAGS = \
$(AM_CFLAGS) \
systemd_uaccess_CFLAGS = \
$(AM_CFLAGS) \