[libvirt] [PATCH 61/89] m4/virt-libxl: properly check for required libxl version
Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com>
---
m4/virt-driver-libxl.m4 | 18 ++++++++++++------
1 file changed, 12 insertions(+), 6 deletions(-)
diff --git a/m4/virt-driver-libxl.m4 b/m4/virt-driver-libxl.m4
index 2fdeaa506e..498cad3240 100644
--- a/m4/virt-driver-libxl.m4
+++ b/m4/virt-driver-libxl.m4
@@ -28,6 +28,7 @@ AC_DEFUN([LIBVIRT_DRIVER_CHECK_LIBXL], [
LIBXL_CFLAGS=""
LIBXL_FIRMWARE_DIR=""
LIBXL_EXECBIN_DIR=""
+ LIBXL_API_VERSION="-DLIBXL_API_VERSION=0x040400"
dnl search for libxl, aka libxenlight
dnl Xen > 4.5 introduced a pkgconfig file, check for it first
@@ -41,17 +42,22 @@ AC_DEFUN([LIBVIRT_DRIVER_CHECK_LIBXL], [
dnl pkgconfig file not found, fallback to lib probe
if test "x$with_libxl" = "xno" ; then
with_libxl="$old_with_libxl"
+
+ dnl LIBXL_API_VERSION 4.4.0 introduced a new parameter to
+ dnl libxl_domain_create_restore for specifying restore parameters.
+ dnl The libxl driver will make use of this new parameter for specifying
+ dnl the Xen migration stream version. Specify LIBXL_API_VERSION to trigger
+ dnl an error if there is too old xenlight
+ CFLAGS="$CFLAGS $LIBXL_API_VERSION"
LIBVIRT_CHECK_LIB([LIBXL], [xenlight], [libxl_ctx_alloc], [libxl.h],
[fail="1"])
+ CFLAGS="$old_CFLAGS"
+
if test $fail = 1; then
- AC_MSG_ERROR([You must install the libxl Library from Xen >= 4.2 to compile
libxenlight driver with -lxl])
+ AC_MSG_ERROR([You must install the libxl Library from Xen >= 4.4 to compile
libxenlight driver with -lxl])
fi
fi
- dnl LIBXL_API_VERSION 4.4.0 introduced a new parameter to
- dnl libxl_domain_create_restore for specifying restore parameters.
- dnl The libxl driver will make use of this new parameter for specifying
- dnl the Xen migration stream version.
- LIBXL_CFLAGS="$LIBXL_CFLAGS -DLIBXL_API_VERSION=0x040400"
+ LIBXL_CFLAGS="$LIBXL_CFLAGS $LIBXL_API_VERSION"
LIBS="$old_LIBS"
CFLAGS="$old_CFLAGS"
--
2.11.0