From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andrew Cooper Subject: [PATCH] tools/libxl: Fix build of libxl with ./configure --disable-blktap2 Date: Fri, 15 Aug 2014 15:32:57 +0100 Message-ID: <1408113177-10339-1-git-send-email-andrew.cooper3@citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: Xen-devel Cc: Andrew Cooper , Ian Jackson , Ian Campbell List-Id: xen-devel@lists.xenproject.org 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 CC: Ian Campbell CC: Ian Jackson --- tools/Rules.mk | 6 +----- 1 file changed, 1 insertion(+), 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) -- 1.7.10.4