From ebff016a19b655ff8c087c3cbe42cb8061cc8f97 Mon Sep 17 00:00:00 2001
From: Karel Zak
Date: Wed, 9 Apr 2014 12:23:30 +0200
Subject: build-sys: consolidate systemd support

 * systemd (since v209) uses only one library (when compiled
   without --enable-compat-libs)

 * all systemd build-sys stuff is merged into HAVE_SYSTEMD
  (automake) and HAVE_LIBSYSTEMD (C macro) now

 * all is controlled by --with-systemd, default is to automatically
   check for systemd libs

 * no more --enable-socket-activation and --enable-journald

Signed-off-by: Karel Zak <kzak@redhat.com>
---
 sys-utils/Makemodule.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'sys-utils/Makemodule.am')

diff --git a/sys-utils/Makemodule.am b/sys-utils/Makemodule.am
index 598f3fee0..a19d58b84 100644
--- a/sys-utils/Makemodule.am
+++ b/sys-utils/Makemodule.am
@@ -53,7 +53,7 @@ dist_man_MANS += sys-utils/fstrim.8
 fstrim_SOURCES = sys-utils/fstrim.c
 fstrim_LDADD = $(LDADD) libcommon.la libmount.la
 fstrim_CFLAGS = $(AM_CFLAGS) -I$(ul_libmount_incdir)
-if HAVE_SYSTEMD_DAEMON
+if HAVE_SYSTEMD
 systemdsystemunit_DATA += \
 		sys-utils/fstrim.service \
 		sys-utils/fstrim.timer
-- 
cgit v1.2.3-55-g7522