From 5433ec02ad97bd1b34686dfce30127a8f23ca894 Mon Sep 17 00:00:00 2001 From: Andrea Bolognani Date: Wed, 14 Mar 2018 15:40:07 +0100 Subject: [PATCH] m4: Fix xenstore detection Commit 596fc3e3897e introduced the ability to detect xenstore using pkg-config for systems with Xen 4.9, but accidentally broke detection for all other systems. Fix the logic so that it works in all cases. Signed-off-by: Andrea Bolognani --- m4/virt-driver-xen.m4 | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/m4/virt-driver-xen.m4 b/m4/virt-driver-xen.m4 index 52d4f51626..1d0acfa363 100644 --- a/m4/virt-driver-xen.m4 +++ b/m4/virt-driver-xen.m4 @@ -42,7 +42,6 @@ AC_DEFUN([LIBVIRT_DRIVER_CHECK_XEN], [ if test "$xen_path_provided" = "no" ; then PKG_CHECK_MODULES([XEN], [xenstore], [ - fail=0 with_xen=yes ], [ fail=1 @@ -52,8 +51,8 @@ AC_DEFUN([LIBVIRT_DRIVER_CHECK_XEN], [ if test "$xen_path_provided" = "yes" || test "$fail" = 1 ; then CFLAGS="$CFLAGS $XEN_CFLAGS" LIBS="$LIBS $XEN_LIBS" + fail=0 AC_CHECK_LIB([xenstore], [xs_read], [ - fail=0 with_xen=yes XEN_LIBS="$XEN_LIBS -lxenstore" ],[ -- GitLab