From patchwork Fri Oct 22 18:46:04 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Roth X-Patchwork-Id: 68933 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 3C83CB70DF for ; Sat, 23 Oct 2010 06:25:39 +1100 (EST) Received: from localhost ([127.0.0.1]:36707 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1P9NF8-0003Sx-Q2 for incoming@patchwork.ozlabs.org; Fri, 22 Oct 2010 15:25:35 -0400 Received: from [140.186.70.92] (port=60276 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1P9Mdi-0000ET-6Z for qemu-devel@nongnu.org; Fri, 22 Oct 2010 14:46:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1P9Mdc-0002k4-AK for qemu-devel@nongnu.org; Fri, 22 Oct 2010 14:46:54 -0400 Received: from e5.ny.us.ibm.com ([32.97.182.145]:53690) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1P9Mdc-0002jy-6v for qemu-devel@nongnu.org; Fri, 22 Oct 2010 14:46:48 -0400 Received: from d01relay03.pok.ibm.com (d01relay03.pok.ibm.com [9.56.227.235]) by e5.ny.us.ibm.com (8.14.4/8.13.1) with ESMTP id o9MIQ0jQ024681 for ; Fri, 22 Oct 2010 14:26:00 -0400 Received: from d01av01.pok.ibm.com (d01av01.pok.ibm.com [9.56.224.215]) by d01relay03.pok.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id o9MIklCq198136 for ; Fri, 22 Oct 2010 14:46:47 -0400 Received: from d01av01.pok.ibm.com (loopback [127.0.0.1]) by d01av01.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id o9MIklbl028085 for ; Fri, 22 Oct 2010 14:46:47 -0400 Received: from localhost.localdomain (sig-9-76-202-211.mts.ibm.com [9.76.202.211]) by d01av01.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id o9MIkHq8025601; Fri, 22 Oct 2010 14:46:46 -0400 From: Michael Roth To: qemu-devel@nongnu.org Date: Fri, 22 Oct 2010 13:46:04 -0500 Message-Id: <1287773165-24855-10-git-send-email-mdroth@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1287773165-24855-1-git-send-email-mdroth@linux.vnet.ibm.com> References: <1287773165-24855-1-git-send-email-mdroth@linux.vnet.ibm.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) Cc: aliguori@linux.vnet.ibm.com, ryanh@us.ibm.com, agl@linux.vnet.ibm.com, mdroth@linux.vnet.ibm.com, abeekhof@redhat.com Subject: [Qemu-devel] [RFC][PATCH 09/10] virtagent: Makefile/configure changes to build virtagent bits X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Michael Roth --- Makefile | 2 +- Makefile.target | 2 +- configure | 25 +++++++++++++++++++++++++ 3 files changed, 27 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 2dd64a3..b513d33 100644 --- a/Makefile +++ b/Makefile @@ -135,7 +135,7 @@ qemu-nbd$(EXESUF): qemu-nbd.o qemu-tool.o qemu-error.o $(trace-obj-y) $(block-ob qemu-io$(EXESUF): qemu-io.o cmd.o qemu-tool.o qemu-error.o $(trace-obj-y) $(block-obj-y) $(qobject-obj-y) $(version-obj-y) -qemu-vp$(EXESUF): qemu-vp.o virtproxy.o qemu-tool.o qemu-error.o qemu-sockets.c $(block-obj-y) $(qobject-obj-y) +qemu-vp$(EXESUF): qemu-vp.o virtproxy.o virtagent-daemon.o virtagent-common.o qemu-tool.o qemu-error.o qemu-sockets.c $(trace-obj-y) $(block-obj-y) $(qobject-obj-y) $(version-obj-y) qemu-img-cmds.h: $(SRC_PATH)/qemu-img-cmds.hx $(call quiet-command,sh $(SRC_PATH)/hxtool -h < $< > $@," GEN $@") diff --git a/Makefile.target b/Makefile.target index c48cbcc..f8f4c13 100644 --- a/Makefile.target +++ b/Makefile.target @@ -164,7 +164,7 @@ endif #CONFIG_BSD_USER # System emulator target ifdef CONFIG_SOFTMMU -obj-y = arch_init.o cpus.o monitor.o machine.o gdbstub.o balloon.o +obj-y = arch_init.o cpus.o monitor.o machine.o gdbstub.o balloon.o virtagent.o virtagent-common.o # virtio has to be here due to weird dependency between PCI and virtio-net. # need to fix this properly obj-y += virtio-blk.o virtio-balloon.o virtio-net.o virtio-serial-bus.o diff --git a/configure b/configure index 27f92e0..cfddad7 100755 --- a/configure +++ b/configure @@ -1261,6 +1261,31 @@ EOF fi ########################################## +# xmlrpc-c probe + +# Look for the xmlrpc-c config program +if test -n "$cross_prefix" && has ${cross_prefix}xmlrpc-c-config; then + xmlrpccconfig=${cross_prefix}xmlrpc-c-config +elif has xmlrpc-c-config; then + xmlrpccconfig=xmlrpc-c-config +else + feature_not_found "xmlrpc-c" +fi + +cat > $TMPC << EOF +#include +int main(void) { xmlrpc_env env; xmlrpc_env_init(&env); return 0; } +EOF +xmlrpc_cflags=`$xmlrpccconfig --cflags 2> /dev/null` +xmlrpc_libs=`$xmlrpccconfig client server-util --libs 2> /dev/null` +if compile_prog "$xmlrpc_cflags" "$xmlrpc_libs"; then + libs_softmmu="$xmlrpc_libs $libs_softmmu" + libs_tools="$xmlrpc_libs $libs_tools" +else + feature_not_found "xmlrpc-c" +fi + +########################################## # VNC TLS detection if test "$vnc_tls" != "no" ; then cat > $TMPC <