"Daniel P. Berrange" <berrange(a)redhat.com> wrote:
> If being able to build --without-lxc --without-qemu
--with-network
> is important, (even if just to forestall bug reports like this one ;-)
> then we'll make it work.
Yes, we need to make that work. The 'network' driver should be usable
by any of the hypervisor drivers. So we'll need to make WITH_BRIDGE
conditional also turned on when network is enabled.
Here's the patch:
From edcfccd47c6abb6c2c94ae89c8d6260383423434 Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyering(a)redhat.com>
Date: Mon, 16 Feb 2009 11:53:14 +0100
Subject: [PATCH] accommodate configuring --without-lxc --without-qemu
* configure.in: Enable internal WITH_BRIDGE support not just for LXC or
QEMU, but also for --with-network. Russell Haering reported that
compilation failed when configured with --without-lxc --without-qemu.
Details:
http://thread.gmane.org/gmane.comp.emulators.libvirt/11928
* src/bridge.h: Use #if WITH_BRIDGE, rather than currently-equivalent
"#if defined(WITH_QEMU) || defined(WITH_LXC)"
---
configure.in | 13 ++++++-------
src/bridge.h | 4 ++--
2 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/configure.in b/configure.in
index 6e04d56..72a64dd 100644
--- a/configure.in
+++ b/configure.in
@@ -287,13 +287,6 @@ if test "$with_qemu" = "yes" ; then
fi
AM_CONDITIONAL([WITH_QEMU], [test "$with_qemu" = "yes"])
-with_bridge=no
-if test "$with_qemu" = "yes" -o "$with_lxc" =
"yes"; then
- with_bridge=yes
- AC_DEFINE_UNQUOTED([WITH_BRIDGE], 1, [whether bridge code is needed])
-fi
-AM_CONDITIONAL([WITH_BRIDGE], [test "$with_bridge" = "yes"])
-
if test "$with_uml" = "yes" ; then
AC_DEFINE_UNQUOTED([WITH_UML], 1, [whether UML driver is enabled])
fi
@@ -729,6 +722,12 @@ if test "$with_network" = "yes" ; then
fi
AM_CONDITIONAL([WITH_NETWORK], [test "$with_network" = "yes"])
+with_bridge=no
+if test "$with_qemu:$with_lxc:$with_network" != "no:no:no"; then
+ with_bridge=yes
+ AC_DEFINE_UNQUOTED([WITH_BRIDGE], 1, [whether bridge code is needed])
+fi
+AM_CONDITIONAL([WITH_BRIDGE], [test "$with_bridge" = "yes"])
dnl
dnl Storage driver checks
diff --git a/src/bridge.h b/src/bridge.h
index 2491123..f37ab72 100644
--- a/src/bridge.h
+++ b/src/bridge.h
@@ -24,7 +24,7 @@
#include <config.h>
-#if defined(WITH_QEMU) || defined(WITH_LXC)
+#if defined(WITH_BRIDGE)
#include <net/if.h>
#include <netinet/in.h>
@@ -101,6 +101,6 @@ int brGetEnableSTP (brControl *ctl,
const char *bridge,
int *enable);
-#endif /* WITH_QEMU || WITH_LXC */
+#endif /* WITH_BRIDGE */
#endif /* __QEMUD_BRIDGE_H__ */
--
1.6.2.rc0.264.g60787