From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=42204 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Om5mH-0008LE-I5 for qemu-devel@nongnu.org; Thu, 19 Aug 2010 10:07:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1Om5m9-00024o-GL for qemu-devel@nongnu.org; Thu, 19 Aug 2010 10:07:33 -0400 Received: from mail-gy0-f173.google.com ([209.85.160.173]:40903) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1Om5m9-00024R-D8 for qemu-devel@nongnu.org; Thu, 19 Aug 2010 10:07:25 -0400 Received: by gyh4 with SMTP id 4so765328gyh.4 for ; Thu, 19 Aug 2010 07:07:25 -0700 (PDT) Message-ID: <4C6D3A74.1020303@codemonkey.ws> Date: Thu, 19 Aug 2010 09:06:44 -0500 From: Anthony Liguori MIME-Version: 1.0 Subject: Re: [Qemu-devel] [PATCH 3/9] add spice into the configure file References: <1282221625-29501-1-git-send-email-kraxel@redhat.com> <1282221625-29501-4-git-send-email-kraxel@redhat.com> In-Reply-To: <1282221625-29501-4-git-send-email-kraxel@redhat.com> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Gerd Hoffmann Cc: qemu-devel@nongnu.org On 08/19/2010 07:40 AM, Gerd Hoffmann wrote: > Signed-off-by: Gerd Hoffmann > Acked-by: Anthony Liguori Regards, Anthony Liguori > --- > configure | 36 ++++++++++++++++++++++++++++++++++++ > 1 files changed, 36 insertions(+), 0 deletions(-) > > diff --git a/configure b/configure > index 13d8be0..56e7084 100755 > --- a/configure > +++ b/configure > @@ -318,6 +318,7 @@ pkgversion="" > check_utests="no" > user_pie="no" > zero_malloc="" > +spice="" > > # OS specific > if check_define __linux__ ; then > @@ -619,6 +620,10 @@ for opt do > ;; > --enable-kvm) kvm="yes" > ;; > + --disable-spice) spice="no" > + ;; > + --enable-spice) spice="yes" > + ;; > --enable-profiler) profiler="yes" > ;; > --enable-cocoa) > @@ -898,6 +903,8 @@ echo " --enable-docs enable documentation build" > echo " --disable-docs disable documentation build" > echo " --disable-vhost-net disable vhost-net acceleration support" > echo " --enable-vhost-net enable vhost-net acceleration support" > +echo " --disable-spice disable spice" > +echo " --enable-spice enable spice" > echo "" > echo "NOTE: The object files are built at the place where configure is launched" > exit 1 > @@ -2048,6 +2055,30 @@ if compile_prog "" ""; then > gcc_attribute_warn_unused_result=yes > fi > > +# spice probe > +if test "$spice" != "no" ; then > + cat> $TMPC<< EOF > +#include > +int main(void) { spice_server_new(); return 0; } > +EOF > + spice_proto_ver=$($pkgconfig --modversion spice-protocol 2>/dev/null) > + spice_server_ver=$($pkgconfig --modversion spice-server 2>/dev/null) > + spice_cflags=$($pkgconfig --cflags spice-protocol spice-server 2>/dev/null) > + spice_libs=$($pkgconfig --libs spice-protocol spice-server 2>/dev/null) > + if compile_prog "$spice_cflags" "$spice_libs" ; then > + spice="yes" > + libs_softmmu="$libs_softmmu $spice_libs" > + QEMU_CFLAGS="$QEMU_CFLAGS $spice_cflags" > + else > + if test "$spice" = "yes" ; then > + feature_not_found "spice" > + fi > + spice="no" > + fi > +fi > + > +########################################## > + > ########################################## > # check if we have fdatasync > > @@ -2190,6 +2221,7 @@ echo "preadv support $preadv" > echo "fdatasync $fdatasync" > echo "uuid support $uuid" > echo "vhost-net support $vhost_net" > +echo "spice support $spice" > > if test $sdl_too_old = "yes"; then > echo "-> Your SDL version is too old - please upgrade to have SDL support" > @@ -2427,6 +2459,10 @@ if test "$fdatasync" = "yes" ; then > echo "CONFIG_FDATASYNC=y">> $config_host_mak > fi > > +if test "$spice" = "yes" ; then > + echo "CONFIG_SPICE=y">> $config_host_mak > +fi > + > # XXX: suppress that > if [ "$bsd" = "yes" ] ; then > echo "CONFIG_BSD=y">> $config_host_mak >