build: ensure storage driver is used

Commit 1c275e9a accidentally dropped the storage driver from
libvirtd, because it depended on a C preprocessor macro that
was not defined.  Furthermore, if you do './configure
--without-storage-dir --with-storage-disk' or any other combination
where you explicitly build a subset of storage backends excluding
the dir backend, then the build is broken.

Based on analysis by Osier Yang.

* configure.ac (WITH_STORAGE): Define top-level conditional.
* src/Makefile.am (mod_LTLIBRARIES): Build driver even when
storage_dir is disabled.
* daemon/libvirtd.c: Pick up storage driver for any backend, not
just dir.
* daemon/Makefile.am (libvirtd_LDADD): Likewise.
This commit is contained in:
Eric Blake
2012-06-05 10:28:52 -06:00
committed by Osier Yang
parent eb635de1fe
commit 3c3644d30f
4 changed files with 17 additions and 4 deletions

View File

@@ -140,7 +140,7 @@ if WITH_UML
libvirtd_LDADD += ../src/libvirt_driver_uml.la
endif
if WITH_STORAGE_DIR
if WITH_STORAGE
libvirtd_LDADD += ../src/libvirt_driver_storage.la
endif