If we build with QEMU, it very probably needs JSON.
Signed-off-by: Ján Tomko <jtomko@xxxxxxxxxx>
---
m4/virt-json.m4 | 22 ++++------------------
1 file changed, 4 insertions(+), 18 deletions(-)
diff --git a/m4/virt-json.m4 b/m4/virt-json.m4
index a5ae3edcd..d87cf56eb 100644
--- a/m4/virt-json.m4
+++ b/m4/virt-json.m4
@@ -36,24 +36,10 @@ AC_DEFUN([LIBVIRT_CHECK_JSON],[
need_json=no
if test "$with_qemu:$with_yajl" = yes:check or
test "$with_qemu:$with_jansson" = yes:check; then
- dnl Some versions of qemu require the use of JSON; try to detect them
- dnl here, although we do not require qemu to exist in order to compile.
- dnl This check mirrors src/qemu/qemu_capabilities.c
- AC_PATH_PROGS([QEMU], [qemu-kvm qemu kvm qemu-system-x86_64],
- [], [$PATH:/usr/bin:/usr/libexec])
- if test -x "$QEMU"; then
- if $QEMU -help 2>/dev/null | grep -q libvirt; then
- need_json=yes
- else
- [qemu_version_sed='s/.*ersion \([0-9.,]*\).*/\1/']
- qemu_version=`$QEMU -version | sed "$qemu_version_sed"`
- case $qemu_version in
- [[1-9]].* | 0.15.* ) need_json=yes ;;
- 0.* | '' ) ;;
- *) AC_MSG_ERROR([Unexpected qemu version string]) ;;
- esac
- fi
- fi
+ dnl Nearly all supported QEMU versions require JSON.
+ dnl Assume we need it by default, but still let the user
+ dnl shoot it the foot.
+ need_json=yes
fi
dnl Jansson http://www.digip.org/jansson/
--
2.16.1
--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list
