External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-22 04:25:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

accommodate configuring --without-lxc --without-qemu

Browse Source 
* 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)"
This commit is contained in:
Jim Meyering 2009-02-17 10:23:19 +00:00
parent a16ee2c83b
commit bdd5094d8f
3 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@ -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> Tue Feb 17 11:18:39 +0100 2009 Jim Meyering <meyering@redhat.com>
doc: fix typo in formatdomain's clock offset specification doc: fix typo in formatdomain's clock offset specification

13
configure.in
View File

@ -287,13 +287,6 @@ if test "$with_qemu" = "yes" ; then
fi fi
AM_CONDITIONAL([WITH_QEMU], [test "$with_qemu" = "yes"]) 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 if test "$with_uml" = "yes" ; then
AC_DEFINE_UNQUOTED([WITH_UML], 1, [whether UML driver is enabled]) AC_DEFINE_UNQUOTED([WITH_UML], 1, [whether UML driver is enabled])
fi fi
@ -729,6 +722,12 @@ if test "$with_network" = "yes" ; then
fi fi
AM_CONDITIONAL([WITH_NETWORK], [test "$with_network" = "yes"]) 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
dnl Storage driver checks dnl Storage driver checks

4
src/bridge.h
View File

@ -24,7 +24,7 @@
#include <config.h> #include <config.h>
#if defined(WITH_QEMU) || defined(WITH_LXC) #if defined(WITH_BRIDGE)
#include <net/if.h> #include <net/if.h>
#include <netinet/in.h> #include <netinet/in.h>
@ -101,6 +101,6 @@ int brGetEnableSTP (brControl *ctl,
const char *bridge, const char *bridge,
int *enable); int *enable);
#endif /* WITH_QEMU || WITH_LXC */ #endif /* WITH_BRIDGE */
#endif /* __QEMUD_BRIDGE_H__ */ #endif /* __QEMUD_BRIDGE_H__ */