mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add spice into the configure file

Browse Source
This commit is contained in:
Gerd Hoffmann 2010-03-24 10:26:51 +01:00
parent da1d85e339
commit cd4ec0b4d1
1 changed files with 35 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
configure vendored
View File

@ -325,6 +325,7 @@ user_pie="no"
zero_malloc="" zero_malloc=""
trace_backend="nop" trace_backend="nop"
trace_file="trace" trace_file="trace"
spice=""
# OS specific # OS specific
if check_define __linux__ ; then if check_define __linux__ ; then
@ -630,6 +631,10 @@ for opt do
;; ;;
--enable-kvm) kvm="yes" --enable-kvm) kvm="yes"
;; ;;
--disable-spice) spice="no"
;;
--enable-spice) spice="yes"
;;
--enable-profiler) profiler="yes" --enable-profiler) profiler="yes"
;; ;;
--enable-cocoa) --enable-cocoa)
@ -912,6 +917,8 @@ echo " --enable-vhost-net enable vhost-net acceleration support"
echo " --trace-backend=B Trace backend nop simple ust" echo " --trace-backend=B Trace backend nop simple ust"
echo " --trace-file=NAME Full PATH,NAME of file to store traces" echo " --trace-file=NAME Full PATH,NAME of file to store traces"
echo " Default:trace-<pid>" echo " Default:trace-<pid>"
echo " --disable-spice disable spice"
echo " --enable-spice enable spice"
echo "" echo ""
echo "NOTE: The object files are built at the place where configure is launched" echo "NOTE: The object files are built at the place where configure is launched"
exit 1 exit 1
@ -2062,6 +2069,29 @@ if compile_prog "" ""; then
gcc_attribute_warn_unused_result=yes gcc_attribute_warn_unused_result=yes
fi fi
# spice probe
if test "$spice" != "no" ; then
cat > $TMPC << EOF
#include <spice.h>
int main(void) { spice_server_new(); return 0; }
EOF
spice_cflags=$($pkgconfig --cflags spice-protocol spice-server 2>/dev/null)
spice_libs=$($pkgconfig --libs spice-protocol spice-server 2>/dev/null)
if $pkgconfig --atleast-version=0.5.3 spice-server &&\
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 # check if we have fdatasync
@ -2245,6 +2275,7 @@ echo "uuid support $uuid"
echo "vhost-net support $vhost_net" echo "vhost-net support $vhost_net"
echo "Trace backend $trace_backend" echo "Trace backend $trace_backend"
echo "Trace output file $trace_file-<pid>" echo "Trace output file $trace_file-<pid>"
echo "spice support $spice"
if test $sdl_too_old = "yes"; then if test $sdl_too_old = "yes"; then
echo "-> Your SDL version is too old - please upgrade to have SDL support" echo "-> Your SDL version is too old - please upgrade to have SDL support"
@ -2482,6 +2513,10 @@ if test "$fdatasync" = "yes" ; then
echo "CONFIG_FDATASYNC=y" >> $config_host_mak echo "CONFIG_FDATASYNC=y" >> $config_host_mak
fi fi
if test "$spice" = "yes" ; then
echo "CONFIG_SPICE=y" >> $config_host_mak
fi
# XXX: suppress that # XXX: suppress that
if [ "$bsd" = "yes" ] ; then if [ "$bsd" = "yes" ] ; then
echo "CONFIG_BSD=y" >> $config_host_mak echo "CONFIG_BSD=y" >> $config_host_mak