On 05/21/2012 01:59 PM, Daniel P. Berrange wrote:
From: "Daniel P. Berrange" <berrange(a)redhat.com>
Only libvirt_driver_storage.la links to libblkid currently. If
we are running in a scenario with driver modules, LXC must
directly link to it, since it can't assume the storage driver
is present
Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com>
---
src/Makefile.am | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/src/Makefile.am b/src/Makefile.am
index ef62e2b..ff3eaec 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -797,6 +797,10 @@ libvirt_driver_lxc_la_CFLAGS = \
$(LIBNL_CFLAGS) \
-I$(top_srcdir)/src/conf $(AM_CFLAGS)
libvirt_driver_lxc_la_LIBADD = $(CAPNG_LIBS) $(LIBNL_LIBS)
+if HAVE_LIBBLKID
+libvirt_driver_lxc_la_CFLAGS += $(BLKID_CFLAGS)
+libvirt_driver_lxc_la_LIBADD += $(BLKID_LIBS)
+endif
ACK. (As with the rest of this series, I didn't compile-test past 3/10,
so I hope it works; but it looks reasonable).
--
Eric Blake eblake(a)redhat.com +1-919-301-3266
Libvirt virtualization library
http://libvirt.org