From 0e285a588a6274d4199867bb397282ee21c0c255 Mon Sep 17 00:00:00 2001 From: "Daniel P. Berrange" Date: Mon, 28 Apr 2014 13:30:36 +0100 Subject: [PATCH] Disable libvirtd by default when building on Win32 We don't support building libvirtd on Win32 since we lack the fork/exec feature needed for the stateful drivers. Disable this by default, so users can just do 'mingw32-configure' with no special args required. Signed-off-by: Daniel P. Berrange --- autobuild.sh | 6 ++---- configure.ac | 6 ++++++ 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/autobuild.sh b/autobuild.sh index f682b51ee4..4d9f616d71 100755 --- a/autobuild.sh +++ b/autobuild.sh @@ -85,8 +85,7 @@ if test -x /usr/bin/i686-w64-mingw32-gcc ; then --host=i686-w64-mingw32 \ --prefix="$AUTOBUILD_INSTALL_ROOT/i686-w64-mingw32/sys-root/mingw" \ --enable-expensive-tests \ - --enable-werror \ - --without-libvirtd + --enable-werror make make install @@ -105,8 +104,7 @@ if test -x /usr/bin/x86_64-w64-mingw32-gcc ; then --host=x86_64-w64-mingw32 \ --prefix="$AUTOBUILD_INSTALL_ROOT/x86_64-w64-mingw32/sys-root/mingw" \ --enable-expensive-tests \ - --enable-werror \ - --without-libvirtd + --enable-werror make make install diff --git a/configure.ac b/configure.ac index ea85851eb0..3371b46cb4 100644 --- a/configure.ac +++ b/configure.ac @@ -175,6 +175,7 @@ case $host in *-*-linux*) with_linux=yes ;; *-*-darwin*) with_osx=yes ;; *-*-freebsd*) with_freebsd=yes ;; + *-*-mingw* | *-*-msvc* ) with_win=yes ;; esac if test $with_linux = no; then @@ -194,6 +195,11 @@ fi AM_CONDITIONAL([WITH_LINUX], [test "$with_linux" = "yes"]) AM_CONDITIONAL([WITH_FREEBSD], [test "$with_freebsd" = "yes"]) +# We don't support the daemon yet +if test "$with_win" = "yes" ; then + with_libvirtd=no +fi + # The daemon requires remote support. Likewise, if we are not using # RPC, we don't need several libraries. if test "$with_remote" = "no" ; then