hyperv: Add configure check for OpenWSMAN

This commit is contained in:
Matthias Bolte 2011-07-13 16:05:18 +02:00
parent 5f57c48528
commit f2e7064373
2 changed files with 47 additions and 0 deletions

View File

@ -69,6 +69,7 @@ XMLRPC_REQUIRED=1.14.0
HAL_REQUIRED=0.5.0 HAL_REQUIRED=0.5.0
DEVMAPPER_REQUIRED=1.0.0 DEVMAPPER_REQUIRED=1.0.0
LIBCURL_REQUIRED="7.18.0" LIBCURL_REQUIRED="7.18.0"
OPENWSMAN_REQUIRED="2.2.3"
LIBPCAP_REQUIRED="1.0.0" LIBPCAP_REQUIRED="1.0.0"
LIBNL_REQUIRED="1.1" LIBNL_REQUIRED="1.1"
LIBSSH2_REQUIRED="1.0" LIBSSH2_REQUIRED="1.0"
@ -287,6 +288,8 @@ AC_ARG_WITH([lxc],
AC_HELP_STRING([--with-lxc], [add Linux Container support @<:@default=check@:>@]),[],[with_lxc=check]) AC_HELP_STRING([--with-lxc], [add Linux Container support @<:@default=check@:>@]),[],[with_lxc=check])
AC_ARG_WITH([esx], AC_ARG_WITH([esx],
AC_HELP_STRING([--with-esx], [add ESX support @<:@default=check@:>@]),[],[with_esx=check]) AC_HELP_STRING([--with-esx], [add ESX support @<:@default=check@:>@]),[],[with_esx=check])
AC_ARG_WITH([hyperv],
AC_HELP_STRING([--with-hyperv], [add Hyper-V support @<:@default=check@:>@]),[],[with_hyperv=check])
AC_ARG_WITH([test], AC_ARG_WITH([test],
AC_HELP_STRING([--with-test], [add test driver support @<:@default=yes@:>@]),[],[with_test=yes]) AC_HELP_STRING([--with-test], [add test driver support @<:@default=yes@:>@]),[],[with_test=yes])
AC_ARG_WITH([remote], AC_ARG_WITH([remote],
@ -1910,6 +1913,35 @@ LIBCURL_CFLAGS="-DCURL_DISABLE_TYPECHECK $LIBCURL_CFLAGS"
AC_SUBST([LIBCURL_CFLAGS]) AC_SUBST([LIBCURL_CFLAGS])
AC_SUBST([LIBCURL_LIBS]) AC_SUBST([LIBCURL_LIBS])
dnl
dnl check for openwsman (Hyper-V)
dnl
OPENWSMAN_CFLAGS=""
OPENWSMAN_LIBS=""
if test "$with_hyperv" = "yes" || test "$with_hyperv" = "check"; then
PKG_CHECK_MODULES([OPENWSMAN], [openwsman >= $OPENWSMAN_REQUIRED], [
if test "$with_hyperv" = "check"; then
with_hyperv=yes
fi
], [
if test "$with_hyperv" = "check"; then
with_hyperv=no
AC_MSG_NOTICE([openwsman is required for the Hyper-V driver, disabling it])
elif test "$with_hyperv" = "yes"; then
AC_MSG_ERROR([openwsman >= $OPENWSMAN_REQUIRED is required for the Hyper-V driver])
fi
])
fi
if test "$with_hyperv" = "yes" ; then
AC_DEFINE_UNQUOTED([WITH_HYPERV], 1, [whether Hyper-V driver is enabled])
fi
AM_CONDITIONAL([WITH_HYPERV], [test "$with_hyperv" = "yes"])
dnl dnl
dnl check for python dnl check for python
dnl dnl
@ -2441,6 +2473,7 @@ AC_MSG_NOTICE([xenlight: $with_libxl])
AC_MSG_NOTICE([ LXC: $with_lxc]) AC_MSG_NOTICE([ LXC: $with_lxc])
AC_MSG_NOTICE([ PHYP: $with_phyp]) AC_MSG_NOTICE([ PHYP: $with_phyp])
AC_MSG_NOTICE([ ESX: $with_esx]) AC_MSG_NOTICE([ ESX: $with_esx])
AC_MSG_NOTICE([ Hyper-V: $with_hyperv])
AC_MSG_NOTICE([ Test: $with_test]) AC_MSG_NOTICE([ Test: $with_test])
AC_MSG_NOTICE([ Remote: $with_remote]) AC_MSG_NOTICE([ Remote: $with_remote])
AC_MSG_NOTICE([ Network: $with_network]) AC_MSG_NOTICE([ Network: $with_network])
@ -2482,6 +2515,11 @@ AC_MSG_NOTICE([ libcurl: $LIBCURL_CFLAGS $LIBCURL_LIBS])
else else
AC_MSG_NOTICE([ libcurl: no]) AC_MSG_NOTICE([ libcurl: no])
fi fi
if test "$with_hyperv" = "yes" ; then
AC_MSG_NOTICE([openwsman: $OPENWSMAN_CFLAGS $OPENWSMAN_LIBS])
else
AC_MSG_NOTICE([openwsman: no])
fi
if test "$with_libssh2" != "no" ; then if test "$with_libssh2" != "no" ; then
AC_MSG_NOTICE([ libssh2: $LIBSSH2_CFLAGS $LIBSSH2_LIBS]) AC_MSG_NOTICE([ libssh2: $LIBSSH2_CFLAGS $LIBSSH2_LIBS])
else else

View File

@ -50,6 +50,7 @@
# Then the hypervisor drivers that talk a native remote protocol # Then the hypervisor drivers that talk a native remote protocol
%define with_phyp 0%{!?_without_phyp:1} %define with_phyp 0%{!?_without_phyp:1}
%define with_esx 0%{!?_without_esx:1} %define with_esx 0%{!?_without_esx:1}
%define with_hyperv 0%{!?_without_hyperv:1}
%define with_xenapi 0%{!?_without_xenapi:1} %define with_xenapi 0%{!?_without_xenapi:1}
# Then the secondary host drivers # Then the secondary host drivers
@ -447,6 +448,9 @@ BuildRequires: libcurl-devel
BuildRequires: curl-devel BuildRequires: curl-devel
%endif %endif
%endif %endif
%if %{with_hyperv}
BuildRequires: libwsman-devel >= 2.2.3
%endif
%if %{with_audit} %if %{with_audit}
BuildRequires: audit-libs-devel BuildRequires: audit-libs-devel
%endif %endif
@ -579,6 +583,10 @@ of recent versions of Linux (and other OSes).
%define _without_esx --without-esx %define _without_esx --without-esx
%endif %endif
%if ! %{with_hyperv}
%define _without_hyperv --without-hyperv
%endif
%if ! %{with_vmware} %if ! %{with_vmware}
%define _without_vmware --without-vmware %define _without_vmware --without-vmware
%endif %endif
@ -697,6 +705,7 @@ of recent versions of Linux (and other OSes).
%{?_without_one} \ %{?_without_one} \
%{?_without_phyp} \ %{?_without_phyp} \
%{?_without_esx} \ %{?_without_esx} \
%{?_without_hyperv} \
%{?_without_vmware} \ %{?_without_vmware} \
%{?_without_network} \ %{?_without_network} \
%{?_with_rhel5_api} \ %{?_with_rhel5_api} \