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)"

diff --git a/ChangeLog b/ChangeLog
index d6cc9a8d3641e6b6b464056723763fa5f5ba2b90..2fddcd40d04a2971963f136848d8b8f51e67a217 100644 (file)
--- 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 6e04d560940b9c17f171946d37f6910c327b9d72..72a64dd26d774426c18aedaf8c652a4bac12f933 100644 (file)
--- 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 249112372523d12b49720d7106cfef667650608b..f37ab721077f16204430af7799c8e462ed4156e5 100644 (file)
--- 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__ */