]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
Ensure LXC driver links against libblkid explicitly.
authorDaniel P. Berrange <berrange@redhat.com>
Mon, 2 Apr 2012 15:47:11 +0000 (16:47 +0100)
committerDaniel P. Berrange <berrange@redhat.com>
Thu, 24 May 2012 12:18:00 +0000 (13:18 +0100)
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>
src/Makefile.am

index a1f46612027c20d38c6afa9171c0b4bff1b92a62..5259ff0081d8a7c49975a2f4631460987b591ae8 100644 (file)
@@ -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