On 10/29/2010 08:34 AM, Matthias Bolte wrote:
This is actually a workaround, to unbreak make check on systems
without VirtualBox.
---
src/vbox/vbox_XPCOMCGlue.c | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/src/vbox/vbox_XPCOMCGlue.c b/src/vbox/vbox_XPCOMCGlue.c
index 7648e54..15a9622 100644
--- a/src/vbox/vbox_XPCOMCGlue.c
+++ b/src/vbox/vbox_XPCOMCGlue.c
@@ -124,7 +124,14 @@ static int tryLoadOne(const char *dir, bool setAppHome, bool
ignoreMissing)
g_hVBoxXPCOMC = dlopen(name, RTLD_NOW | RTLD_LOCAL);
if (g_hVBoxXPCOMC == NULL) {
- VIR_WARN("Could not dlopen '%s': %s", name, dlerror());
+ /*
+ * FIXME: Don't warn in this case as it currently breaks make check
+ * on systems without VirtualBox.
+ */
+ if (dir != NULL) {
+ VIR_WARN("Could not dlopen '%s': %s", name, dlerror());
+ }
+
ACK for 0.8.5. Post-release, we may want to revisit my suggestions of
making ./configure --with-vbox smarter, but that's complex enough that
it should not hold up a release.
https://www.redhat.com/archives/libvir-list/2010-October/msg00882.html
--
Eric Blake eblake(a)redhat.com +1-801-349-2682
Libvirt virtualization library
http://libvirt.org