NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

Disable stateful OpenNebula driver if libvirtd is disabled

Browse Source 
Also move the equivalent checks for LXC and UML before their header
checks. This way configure doesn't check for the headers when the driver
gets disabled anyway.
This commit is contained in:
Matthias Bolte 2010-04-23 18:00:19 +02:00
parent 8d319a2f2d
commit 258923f2eb
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
configure.ac
View File

@ -485,6 +485,9 @@ AC_CHECK_HEADERS([linux/kvm.h])
dnl dnl
dnl check for sufficient headers for LXC dnl check for sufficient headers for LXC
dnl dnl
if test "$with_libvirtd" = "no" ; then
with_lxc=no
fi
if test "$with_lxc" = "yes" || test "$with_lxc" = "check"; then if test "$with_lxc" = "yes" || test "$with_lxc" = "check"; then
AC_CHECK_HEADER([sched.h], AC_CHECK_HEADER([sched.h],
dnl Header is there, check for unshare() dnl Header is there, check for unshare()
@ -515,9 +518,6 @@ if test "$with_lxc" = "yes" || test "$with_lxc" = "check"; then
]) ])
fi fi
if test "$with_libvirtd" = "no" ; then
with_lxc=no
fi
if test "$with_lxc" = "yes" ; then if test "$with_lxc" = "yes" ; then
AC_DEFINE_UNQUOTED([WITH_LXC], 1, [whether LXC driver is enabled]) AC_DEFINE_UNQUOTED([WITH_LXC], 1, [whether LXC driver is enabled])
fi fi
@ -539,6 +539,9 @@ PKG_PROG_PKG_CONFIG
dnl OpenNebula driver Compilation setting dnl OpenNebula driver Compilation setting
dnl dnl
if test "$with_libvirtd" = "no" ; then
with_one=no
fi
XMLRPC_CFLAGS= XMLRPC_CFLAGS=
XMLRPC_LIBS= XMLRPC_LIBS=
if test "x$with_one" = "xyes" || test "x$with_one" = "xcheck"; then if test "x$with_one" = "xyes" || test "x$with_one" = "xcheck"; then
@ -1072,6 +1075,9 @@ dnl
dnl Checks for the UML driver dnl Checks for the UML driver
dnl dnl
if test "$with_libvirtd" = "no" ; then
with_uml=no
fi
if test "$with_uml" = "yes" || test "$with_uml" = "check"; then if test "$with_uml" = "yes" || test "$with_uml" = "check"; then
AC_CHECK_HEADER([sys/inotify.h], [ AC_CHECK_HEADER([sys/inotify.h], [
with_uml=yes with_uml=yes
@ -1084,9 +1090,6 @@ if test "$with_uml" = "yes" || test "$with_uml" = "check"; then
fi fi
]) ])
fi fi
if test "$with_libvirtd" = "no" ; then
with_uml=no
fi
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