From: Daniel P. Berrange <berrange@redhat.com>
Date: Mon, 2 Apr 2012 15:47:11 +0000 (+0100)
Subject: Ensure LXC driver links against libblkid explicitly.
X-Git-Tag: v0.9.13-rc1~217
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ee53a8c8ec0f5ca91aa2e934edc849293e27ec40;p=thirdparty%2Flibvirt.git

Ensure LXC driver links against libblkid explicitly.

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@redhat.com>
---

diff --git a/src/Makefile.am b/src/Makefile.am
index a1f4661202..5259ff0081 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -795,6 +795,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
 if WITH_SECDRIVER_SELINUX
 libvirt_driver_lxc_la_LIBADD += $(SELINUX_LIBS)
 endif