From bdd5094d8f1fbf7fef06c11d58238ef852ac82e9 Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyering@redhat.com>
Date: Tue, 17 Feb 2009 10:23:19 +0000
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)"
---
 ChangeLog    | 10 ++++++++++
 configure.in | 13 ++++++-------
 src/bridge.h |  4 ++--
 3 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index d6cc9a8d36..2fddcd40d0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+Tue Feb 17 11:21:00 +0100 2009 Jim Meyering <meyering@redhat.com>
+
+	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)"
+
 Tue Feb 17 11:18:39 +0100 2009 Jim Meyering <meyering@redhat.com>
 
 	doc: fix typo in formatdomain's clock offset specification
diff --git a/configure.in b/configure.in
index 6e04d56094..72a64dd26d 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 2491123725..f37ab72107 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__ */
-- 
GitLab