mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-08-28 03:21:19 +00:00
Fix libcurl automatic check and ESX status
* configure.in: if libcurl is not present ESX should be desactivated so default to check for esx
This commit is contained in:
parent
10a4e969a6
commit
939cc47431
31
configure.in
31
configure.in
@ -198,7 +198,7 @@ AC_ARG_WITH([lxc],
|
|||||||
AC_ARG_WITH([one],
|
AC_ARG_WITH([one],
|
||||||
[ --with-one add ONE support (on)],[],[with_one=check])
|
[ --with-one add ONE support (on)],[],[with_one=check])
|
||||||
AC_ARG_WITH([esx],
|
AC_ARG_WITH([esx],
|
||||||
[ --with-esx add ESX support (on)],[],[with_esx=yes])
|
[ --with-esx add ESX support (on)],[],[with_esx=check])
|
||||||
AC_ARG_WITH([test],
|
AC_ARG_WITH([test],
|
||||||
[ --with-test add test driver support (on)],[],[with_test=yes])
|
[ --with-test add test driver support (on)],[],[with_test=yes])
|
||||||
AC_ARG_WITH([remote],
|
AC_ARG_WITH([remote],
|
||||||
@ -1139,7 +1139,7 @@ AC_SUBST([LIBPARTED_CFLAGS])
|
|||||||
AC_SUBST([LIBPARTED_LIBS])
|
AC_SUBST([LIBPARTED_LIBS])
|
||||||
|
|
||||||
dnl
|
dnl
|
||||||
dnl check for libcurl
|
dnl check for libcurl (ESX)
|
||||||
dnl
|
dnl
|
||||||
|
|
||||||
LIBCURL_CFLAGS=""
|
LIBCURL_CFLAGS=""
|
||||||
@ -1147,13 +1147,18 @@ LIBCURL_LIBS=""
|
|||||||
LIBCURL_REQUIRED="7.18.0"
|
LIBCURL_REQUIRED="7.18.0"
|
||||||
LIBCURL_FOUND="no"
|
LIBCURL_FOUND="no"
|
||||||
|
|
||||||
if test "$with_esx" = "yes" ; then
|
if test "$with_esx" = "yes" -o "$with_esx" = "check"; then
|
||||||
PKG_CHECK_MODULES(LIBCURL, libcurl >= $LIBCURL_REQUIRED, [LIBCURL_FOUND=yes], [LIBCURL_FOUND=no])
|
PKG_CHECK_MODULES(LIBCURL, libcurl >= $LIBCURL_REQUIRED, [
|
||||||
|
LIBCURL_FOUND=yes
|
||||||
if test "$LIBCURL_FOUND" = "no"; then
|
with_esx="yes"
|
||||||
AC_MSG_CHECKING(for libcurl libraries >= $LIBCURL_REQUIRED)
|
], [
|
||||||
AC_MSG_ERROR([libcurl >= $LIBCURL_REQUIRED is required for the ESX driver])
|
if test "$with_esx" = "check"; then
|
||||||
fi
|
with_esx=no
|
||||||
|
AC_MSG_NOTICE([libcurl is required for ESX driver, disabling it])
|
||||||
|
else
|
||||||
|
AC_MSG_ERROR([libcurl >= $LIBCURL_REQUIRED is required for the ESX driver])
|
||||||
|
fi
|
||||||
|
])
|
||||||
fi
|
fi
|
||||||
|
|
||||||
AC_SUBST([LIBCURL_CFLAGS])
|
AC_SUBST([LIBCURL_CFLAGS])
|
||||||
@ -1595,15 +1600,15 @@ AC_MSG_NOTICE([ dlopen: $DRIVER_MODULES_CFLAGS $DRIVER_MODULES_LIBS])
|
|||||||
else
|
else
|
||||||
AC_MSG_NOTICE([ dlopen: no])
|
AC_MSG_NOTICE([ dlopen: no])
|
||||||
fi
|
fi
|
||||||
|
AC_MSG_NOTICE([])
|
||||||
|
AC_MSG_NOTICE([Libraries])
|
||||||
|
AC_MSG_NOTICE([])
|
||||||
|
AC_MSG_NOTICE([ libxml: $LIBXML_CFLAGS $LIBXML_LIBS])
|
||||||
if test "$with_esx" = "yes" ; then
|
if test "$with_esx" = "yes" ; then
|
||||||
AC_MSG_NOTICE([ libcurl: $LIBCURL_CFLAGS $LIBCURL_LIBS])
|
AC_MSG_NOTICE([ libcurl: $LIBCURL_CFLAGS $LIBCURL_LIBS])
|
||||||
else
|
else
|
||||||
AC_MSG_NOTICE([ libcurl: no])
|
AC_MSG_NOTICE([ libcurl: no])
|
||||||
fi
|
fi
|
||||||
AC_MSG_NOTICE([])
|
|
||||||
AC_MSG_NOTICE([Libraries])
|
|
||||||
AC_MSG_NOTICE([])
|
|
||||||
AC_MSG_NOTICE([ libxml: $LIBXML_CFLAGS $LIBXML_LIBS])
|
|
||||||
if test "$with_libssh" != "no" ; then
|
if test "$with_libssh" != "no" ; then
|
||||||
AC_MSG_NOTICE([ libssh: $LIBSSH_CFLAGS $LIBSSH_LIBS])
|
AC_MSG_NOTICE([ libssh: $LIBSSH_CFLAGS $LIBSSH_LIBS])
|
||||||
else
|
else
|
||||||
|
Loading…
Reference in New Issue
Block a user