diff options
| author | Zdenek Kabelac <zkabelac@redhat.com> | 2017-08-01 18:17:06 +0200 |
|---|---|---|
| committer | Zdenek Kabelac <zkabelac@redhat.com> | 2017-08-01 18:17:06 +0200 |
| commit | 95dd5bc7fb7dc818116ee367aaa3079f410e2cf7 (patch) | |
| tree | aa577857635c23ae0f44a92a741f759e6aa48031 /make.tmpl.in | |
| parent | 92b53a80772a5a7f18c95ac4f3154a3cd4b1ce43 (diff) | |
| download | lvm2-95dd5bc7fb7dc818116ee367aaa3079f410e2cf7.tar.gz | |
configure: tune BUILD_DMEVENTD
Drop 'DMEVENT' make variable and use BUILD_DMEVENTD like with other daemons.
NOTE: by default we do not build dmeventd - maybe time to change
as lot of build targets basically do need dmeventd...
Switch to use SYSTEMD_LIBS and avoid linking systemd library with
every linked tool when dbus notification are enabled.
(TODO add missing testing for lib presence)
Diffstat (limited to 'make.tmpl.in')
| -rw-r--r-- | make.tmpl.in | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/make.tmpl.in b/make.tmpl.in index 20041f982..17276c389 100644 --- a/make.tmpl.in +++ b/make.tmpl.in @@ -62,7 +62,7 @@ CLDFLAGS += @CLDFLAGS@ ELDFLAGS += @ELDFLAGS@ LDDEPS += @LDDEPS@ LIB_SUFFIX = @LIB_SUFFIX@ -LVMINTERNAL_LIBS = -llvm-internal $(DMEVENT_LIBS) $(DAEMON_LIBS) $(UDEV_LIBS) $(DL_LIBS) $(BLKID_LIBS) +LVMINTERNAL_LIBS = -llvm-internal $(DMEVENT_LIBS) $(DAEMON_LIBS) $(SYSTEMD_LIBS) $(UDEV_LIBS) $(DL_LIBS) $(BLKID_LIBS) DL_LIBS = @DL_LIBS@ RT_LIBS = @RT_LIBS@ M_LIBS = @M_LIBS@ @@ -73,6 +73,7 @@ UDEV_CFLAGS = @UDEV_CFLAGS@ UDEV_LIBS = @UDEV_LIBS@ BLKID_CFLAGS = @BLKID_CFLAGS@ BLKID_LIBS = @BLKID_LIBS@ +SYSTEMD_LIBS = @SYSTEMD_LIBS@ VALGRIND_CFLAGS = @VALGRIND_CFLAGS@ TESTING = @TESTING@ @@ -267,7 +268,7 @@ DAEMON_LIBS = -ldaemonclient LDFLAGS += -L$(top_builddir)/libdaemon/client CLDFLAGS += -L$(top_builddir)/libdaemon/client -ifeq ("@DMEVENTD@", "yes") +ifeq ("@BUILD_DMEVENTD@", "yes") DMEVENT_LIBS = -ldevmapper-event LDFLAGS += -L$(top_builddir)/daemons/dmeventd CLDFLAGS += -L$(top_builddir)/daemons/dmeventd |