summaryrefslogtreecommitdiffstats
path: root/misc-utils/Makemodule.am
diff options
context:
space:
mode:
authorSami Kerola2014-01-07 00:39:08 +0100
committerKarel Zak2014-01-07 12:17:37 +0100
commitea45d34c7c8e2c9017c3e0ee57c202928157a482 (patch)
tree8a543ef4c045d7992efa509e012627f67d63d105 /misc-utils/Makemodule.am
parentunshare: Add possibility to add mapping into root user in user namespace (diff)
downloadkernel-qcow2-util-linux-ea45d34c7c8e2c9017c3e0ee57c202928157a482.tar.gz
kernel-qcow2-util-linux-ea45d34c7c8e2c9017c3e0ee57c202928157a482.tar.xz
kernel-qcow2-util-linux-ea45d34c7c8e2c9017c3e0ee57c202928157a482.zip
uuidd: use pkg-config to find systemd-deamon support
[kzak@redhat.com: - remove USE_SOCKET_ACTIVATION and use HAVE_* as we use for another libs] Signed-off-by: Sami Kerola <kerolasa@iki.fi> Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'misc-utils/Makemodule.am')
-rw-r--r--misc-utils/Makemodule.am8
1 files changed, 3 insertions, 5 deletions
diff --git a/misc-utils/Makemodule.am b/misc-utils/Makemodule.am
index 686fb1574..d30229d5f 100644
--- a/misc-utils/Makemodule.am
+++ b/misc-utils/Makemodule.am
@@ -72,11 +72,9 @@ uuidd_LDADD = $(LDADD) libuuid.la libcommon.la
uuidd_CFLAGS = $(DAEMON_CFLAGS) $(AM_CFLAGS) -I$(ul_libuuid_incdir)
uuidd_LDFLAGS = $(DAEMON_LDFLAGS) $(AM_LDFLAGS)
uuidd_SOURCES = misc-utils/uuidd.c
-if USE_SOCKET_ACTIVATION
-uuidd_SOURCES += misc-utils/sd-daemon.c misc-utils/sd-daemon.h
-uuidd_LDADD += -lrt
-endif
-if HAVE_SYSTEMD
+if HAVE_SYSTEMD_DAEMON
+uuidd_LDADD += $(SYSTEMD_DAEMON_LIBS)
+uuidd_CFLAGS += $(SYSTEMD_DAEMON_CFLAGS)
systemdsystemunit_DATA += \
misc-utils/uuidd.service \
misc-utils/uuidd.socket