From patchwork Wed Nov 3 11:35:38 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Roth X-Patchwork-Id: 69972 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 EB9C9B70DA for ; Wed, 3 Nov 2010 22:38:13 +1100 (EST) Received: from localhost ([127.0.0.1]:33146 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PDbfO-0006tf-Ep for incoming@patchwork.ozlabs.org; Wed, 03 Nov 2010 07:38:10 -0400 Received: from [140.186.70.92] (port=48349 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PDbdh-0006n7-KY for qemu-devel@nongnu.org; Wed, 03 Nov 2010 07:36:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PDbde-0005SU-Nh for qemu-devel@nongnu.org; Wed, 03 Nov 2010 07:36:25 -0400 Received: from e7.ny.us.ibm.com ([32.97.182.137]:41728) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PDbde-0005SH-Kx for qemu-devel@nongnu.org; Wed, 03 Nov 2010 07:36:22 -0400 Received: from d01relay03.pok.ibm.com (d01relay03.pok.ibm.com [9.56.227.235]) by e7.ny.us.ibm.com (8.14.4/8.13.1) with ESMTP id oA3BK2sf012688 for ; Wed, 3 Nov 2010 07:20:02 -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 oA3BaMnF271798 for ; Wed, 3 Nov 2010 07:36:22 -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 oA3BaLWB013836 for ; Wed, 3 Nov 2010 07:36:21 -0400 Received: from localhost.localdomain (sig-9-76-99-21.mts.ibm.com [9.76.99.21]) by d01av01.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id oA3Ba4io013140; Wed, 3 Nov 2010 07:36:21 -0400 From: Michael Roth To: qemu-devel@nongnu.org Date: Wed, 3 Nov 2010 06:35:38 -0500 Message-Id: <1288784139-1110-10-git-send-email-mdroth@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1288784139-1110-1-git-send-email-mdroth@linux.vnet.ibm.com> References: <1288784139-1110-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, agl@linux.vnet.ibm.com, mdroth@linux.vnet.ibm.com Subject: [Qemu-devel] [RFC][PATCH v2 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 <