diff options
| author | Karel Zak | 2014-04-09 12:23:30 +0200 |
|---|---|---|
| committer | Karel Zak | 2014-04-09 12:23:30 +0200 |
| commit | ebff016a19b655ff8c087c3cbe42cb8061cc8f97 (patch) | |
| tree | 1eae1278c9711d79e53d90e966b961034c57f106 /misc-utils/Makemodule.am | |
| parent | build-sys: fix fstrim systemd stuff (diff) | |
| download | kernel-qcow2-util-linux-ebff016a19b655ff8c087c3cbe42cb8061cc8f97.tar.gz kernel-qcow2-util-linux-ebff016a19b655ff8c087c3cbe42cb8061cc8f97.tar.xz kernel-qcow2-util-linux-ebff016a19b655ff8c087c3cbe42cb8061cc8f97.zip | |
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>
Diffstat (limited to 'misc-utils/Makemodule.am')
| -rw-r--r-- | misc-utils/Makemodule.am | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/misc-utils/Makemodule.am b/misc-utils/Makemodule.am index 82577f2fa..1ff2e540c 100644 --- a/misc-utils/Makemodule.am +++ b/misc-utils/Makemodule.am @@ -20,9 +20,9 @@ endif usrbin_exec_PROGRAMS += logger dist_man_MANS += misc-utils/logger.1 logger_SOURCES = misc-utils/logger.c lib/strutils.c -if HAVE_JOURNALD -logger_LDADD = $(SYSTEMD_JOURNAL_LIBS) -logger_CFLAGS = $(SYSTEMD_JOURNAL_CFLAGS) +if HAVE_SYSTEMD +logger_LDADD = $(SYSTEMD_LIBS) $(SYSTEMD_JOURNAL_LIBS) +logger_CFLAGS = $(SYSTEMD_CFLAGS) $(SYSTEMD_JOURNAL_CFLAGS) endif usrbin_exec_PROGRAMS += look @@ -77,9 +77,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 HAVE_SYSTEMD_DAEMON -uuidd_LDADD += $(SYSTEMD_DAEMON_LIBS) -uuidd_CFLAGS += $(SYSTEMD_DAEMON_CFLAGS) +if HAVE_SYSTEMD +uuidd_LDADD += $(SYSTEMD_LIBS) $(SYSTEMD_DAEMON_LIBS) +uuidd_CFLAGS += $(SYSTEMD_CFLAGS) $(SYSTEMD_DAEMON_CFLAGS) systemdsystemunit_DATA += \ misc-utils/uuidd.service \ misc-utils/uuidd.socket |