]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
Fix --without-libvirtd builds
authorDoug Goldstein <cardoe@cardoe.com>
Sun, 17 Mar 2013 01:57:55 +0000 (20:57 -0500)
committerDoug Goldstein <cardoe@cardoe.com>
Tue, 19 Mar 2013 21:02:53 +0000 (16:02 -0500)
When building with --without-libvirtd and udev support is detected we
will fail to build with the following error:
    node_device/node_device_udev.c:1608:37: error: unknown type name
        'virStateInhibitCallback'
(cherry picked from commit 52ad612c1e5f469a7a2863fd149ecc434d76ac6e)

src/Makefile.am

index f6162df4e1f6cb600b3b7658f73a81d8ad585a91..94bf9b23227ed9a3985b2d8752427f7ec6e9af1f 100644 (file)
@@ -1232,6 +1232,7 @@ libvirt_driver_nodedev_la_CFLAGS = \
 libvirt_driver_nodedev_la_LDFLAGS = $(AM_LDFLAGS)
 libvirt_driver_nodedev_la_LIBADD =
 
+if WITH_LIBVIRTD
 if WITH_HAL
 libvirt_driver_nodedev_la_SOURCES += $(NODE_DEVICE_DRIVER_HAL_SOURCES)
 libvirt_driver_nodedev_la_CFLAGS += $(HAL_CFLAGS)
@@ -1242,6 +1243,7 @@ libvirt_driver_nodedev_la_SOURCES += $(NODE_DEVICE_DRIVER_UDEV_SOURCES)
 libvirt_driver_nodedev_la_CFLAGS += $(UDEV_CFLAGS) $(PCIACCESS_CFLAGS)
 libvirt_driver_nodedev_la_LIBADD += $(UDEV_LIBS) $(PCIACCESS_LIBS)
 endif
+endif
 
 if WITH_DRIVER_MODULES
 libvirt_driver_nodedev_la_LIBADD += ../gnulib/lib/libgnu.la