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. --- configure.ac | 15 +++++++++------ 1 files changed, 9 insertions(+), 6 deletions(-) diff --git a/configure.ac b/configure.ac index e34f417..aeab7d9 100644 --- a/configure.ac +++ b/configure.ac @@ -484,6 +484,9 @@ AC_CHECK_HEADERS([linux/kvm.h]) dnl dnl check for sufficient headers for LXC dnl +if test "$with_libvirtd" = "no" ; then + with_lxc=no +fi if test "$with_lxc" = "yes" || test "$with_lxc" = "check"; then AC_CHECK_HEADER([sched.h], dnl Header is there, check for unshare() @@ -514,9 +517,6 @@ if test "$with_lxc" = "yes" || test "$with_lxc" = "check"; then ]) fi -if test "$with_libvirtd" = "no" ; then - with_lxc=no -fi if test "$with_lxc" = "yes" ; then AC_DEFINE_UNQUOTED([WITH_LXC], 1, [whether LXC driver is enabled]) fi @@ -538,6 +538,9 @@ PKG_PROG_PKG_CONFIG dnl OpenNebula driver Compilation setting dnl +if test "$with_libvirtd" = "no" ; then + with_one=no +fi XMLRPC_CFLAGS= XMLRPC_LIBS= if test "x$with_one" = "xyes" || test "x$with_one" = "xcheck"; then @@ -1071,6 +1074,9 @@ dnl dnl Checks for the UML driver dnl +if test "$with_libvirtd" = "no" ; then + with_uml=no +fi if test "$with_uml" = "yes" || test "$with_uml" = "check"; then AC_CHECK_HEADER([sys/inotify.h], [ with_uml=yes @@ -1083,9 +1089,6 @@ if test "$with_uml" = "yes" || test "$with_uml" = "check"; then fi ]) fi -if test "$with_libvirtd" = "no" ; then - with_uml=no -fi if test "$with_uml" = "yes" ; then AC_DEFINE_UNQUOTED([WITH_UML], 1, [whether UML driver is enabled]) fi -- 1.6.3.3