From patchwork Mon Jan 17 13:15:17 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Roth X-Patchwork-Id: 79170 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 56FF3B70CC for ; Tue, 18 Jan 2011 00:37:29 +1100 (EST) Received: from localhost ([127.0.0.1]:47292 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PepGu-0001cZ-6g for incoming@patchwork.ozlabs.org; Mon, 17 Jan 2011 08:37:24 -0500 Received: from [140.186.70.92] (port=33110 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Peowr-0007Bx-W9 for qemu-devel@nongnu.org; Mon, 17 Jan 2011 08:16:43 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Peowm-0006Mi-LX for qemu-devel@nongnu.org; Mon, 17 Jan 2011 08:16:39 -0500 Received: from e3.ny.us.ibm.com ([32.97.182.143]:59188) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Peowm-0006Me-Iz for qemu-devel@nongnu.org; Mon, 17 Jan 2011 08:16:36 -0500 Received: from d01dlp02.pok.ibm.com (d01dlp02.pok.ibm.com [9.56.224.85]) by e3.ny.us.ibm.com (8.14.4/8.13.1) with ESMTP id p0HCvJRE021827 for ; Mon, 17 Jan 2011 07:57:38 -0500 Received: from d01relay06.pok.ibm.com (d01relay06.pok.ibm.com [9.56.227.116]) by d01dlp02.pok.ibm.com (Postfix) with ESMTP id B54A04DE803F for ; Mon, 17 Jan 2011 08:13:22 -0500 (EST) Received: from d01av04.pok.ibm.com (d01av04.pok.ibm.com [9.56.224.64]) by d01relay06.pok.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id p0HDGZPC2363398 for ; Mon, 17 Jan 2011 08:16:35 -0500 Received: from d01av04.pok.ibm.com (loopback [127.0.0.1]) by d01av04.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id p0HDGYkf031796 for ; Mon, 17 Jan 2011 08:16:35 -0500 Received: from localhost.localdomain (sig-9-76-0-14.mts.ibm.com [9.76.0.14]) by d01av04.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id p0HDFULJ026421; Mon, 17 Jan 2011 08:16:33 -0500 From: Michael Roth To: qemu-devel@nongnu.org Date: Mon, 17 Jan 2011 07:15:17 -0600 Message-Id: <1295270117-24760-24-git-send-email-mdroth@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1295270117-24760-1-git-send-email-mdroth@linux.vnet.ibm.com> References: <1295270117-24760-1-git-send-email-mdroth@linux.vnet.ibm.com> X-Content-Scanned: Fidelis XPS MAILER X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) Cc: agl@linux.vnet.ibm.com, stefanha@linux.vnet.ibm.com, Jes.Sorensen@redhat.com, marcel.mittelstaedt@de.ibm.com, mdroth@linux.vnet.ibm.com, markus_mueller@de.ibm.com, aliguori@linux.vnet.ibm.com, ryanh@us.ibm.com, abeekhof@redhat.com Subject: [Qemu-devel] [RFC][PATCH v6 23/23] virtagent: various bits to build QEMU with virtagent 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.target | 2 +- configure | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 1 deletions(-) diff --git a/Makefile.target b/Makefile.target index e15b1c4..8564a8f 100644 --- a/Makefile.target +++ b/Makefile.target @@ -186,7 +186,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-server.o virtagent-common.o # virtio has to be here due to weird dependency between PCI and virtio-net. # need to fix this properly obj-$(CONFIG_NO_PCI) += pci-stub.o diff --git a/configure b/configure index 438219b..4814351 100755 --- a/configure +++ b/configure @@ -1271,6 +1271,37 @@ EOF fi ########################################## +# xmlrpc-c probe + +discard_cmake_vars() { + echo "$@" | sed 's/@.*@//g' +} + +# 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_cflags=`discard_cmake_vars $xmlrpc_cflags` +xmlrpc_libs=`$xmlrpccconfig client server-util --libs 2> /dev/null` +xmlrpc_libs=`discard_cmake_vars $xmlrpc_libs` +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 <