From 3390e973a1d62d356f54bd1540c1663be5ed4ec0 Mon Sep 17 00:00:00 2001 From: Eric Blake Date: Mon, 6 May 2013 08:18:39 -0600 Subject: [PATCH] Skip libxl driver on Xen 4.2 Specific to v0.9.11. This is the opposite of commit dfa1e1dd, and done for the purposes of minimal code changes to allow compilation of libxl on Fedora 17 which still has experimental libxl 4.1, while still being able to compile the branch (minus libxl code) on Fedora 18 and later. Signed-off-by: Eric Blake --- configure.ac | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index e3cf4e2d1a..dbd61196bb 100644 --- a/configure.ac +++ b/configure.ac @@ -639,9 +639,16 @@ if test "$with_libxl" != "no" ; then CFLAGS="$CFLAGS $LIBXL_CFLAGS" LIBS="$LIBS $LIBXL_LIBS" AC_CHECK_LIB([xenlight], [libxl_domain_create_new], [ - with_libxl=yes + dnl The v0.9.11-maint branch of libvirt is designed for Fedora 17, where + dnl libxl 4.1 was still experimental. Make sure we don't try to compile + dnl against libxl 4.2 or greater (opposite what newer libvirt does). + AC_CHECK_LIB([xenlight], [libxl_ctx_alloc], [ + if test "$with_libxl" = "yes"; then + fail=1 + fi + with_libxl=no], [with_libxl=yes]) LIBXL_LIBS="$LIBXL_LIBS -lxenlight -lxenstore -lxenctrl -lxenguest -luuid -lutil -lblktapctl" - ],[ + ],[ if test "$with_libxl" = "yes"; then fail=1 fi -- GitLab