[Xen-changelog] [xen master] tools/libxl: Fix build of libxl with ./configure --disable-blktap2

[patchbot@xxxxxxx]

commit 489ddd21e3bb7782902a2e983183c7b2f64a8fef
Author:     Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
AuthorDate: Fri Aug 15 15:32:57 2014 +0100
Commit:     Ian Campbell <ian.campbell@xxxxxxxxxx>
CommitDate: Mon Sep 8 11:21:18 2014 +0100

    tools/libxl: Fix build of libxl with ./configure --disable-blktap2
    
    Autoconf already has appropriate Linux/non-Linux logic for CONFIG_BLKTAP2.
    
    Let LIBXL_BLKTAP inherit directly from CONFIG_BLKTAP2, rather than 
requiring a
    further LIBXL_BLKTAP=n in addition to ./configure --disable-blktap2 to get
    libxl to successfully link under Linux.
    
    Signed-off-by: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
    CC: Ian Campbell <Ian.Campbell@xxxxxxxxxx>
    CC: Ian Jackson <Ian.Jackson@xxxxxxxxxxxxx>
    Acked-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
---
 tools/Rules.mk |    6 +-----
 1 files changed, 1 insertions(+), 5 deletions(-)

diff --git a/tools/Rules.mk b/tools/Rules.mk
index 5bac700..fa59365 100644
--- a/tools/Rules.mk
+++ b/tools/Rules.mk
@@ -55,11 +55,7 @@ CFLAGS_libxenvchan = -I$(XEN_LIBVCHAN)
 LDLIBS_libxenvchan = $(SHLIB_libxenctrl) $(SHLIB_libxenstore) 
-L$(XEN_LIBVCHAN) -lxenvchan
 SHLIB_libxenvchan  = -Wl,-rpath-link=$(XEN_LIBVCHAN)
 
-ifeq ($(CONFIG_Linux),y)
-LIBXL_BLKTAP ?= y
-else
-LIBXL_BLKTAP ?= n
-endif
+LIBXL_BLKTAP ?= $(CONFIG_BLKTAP2)
 
 ifeq ($(LIBXL_BLKTAP),y)
 CFLAGS_libblktapctl = -I$(XEN_BLKTAP2)/control -I$(XEN_BLKTAP2)/include 
$(CFLAGS_xeninclude)
--
generated by git-patchbot for /home/xen/git/xen.git#master

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog