| Message ID | 1375453248-7178-2-git-send-email-mjt@msgid.tls.msk.ru |
|---|---|
| State | New |
| Headers | show |
Am 02.08.2013 16:20, schrieb Michael Tokarev: > Move qemu-ga build check out of if softmmu.. into its own section. > We want to build qemu-ga for _guest_ even if system build isn't > done. It is controlled separately using --enable-guest-agent. > Additionally, give error message if guest agent is requested but > not supported. > > Signed-off-by: Michael Tokarev <mjt@tls.msk.ru> > --- > configure | 11 ++++++++--- > 1 file changed, 8 insertions(+), 3 deletions(-) > > diff --git a/configure b/configure > index f0761ea..293f167 100755 > --- a/configure > +++ b/configure > @@ -231,7 +231,7 @@ libusb="" > usb_redir="" > glx="" > zlib="yes" > -guest_agent="yes" > +guest_agent="" > want_tools="yes" > libiscsi="" > coroutine="" > @@ -3444,10 +3444,15 @@ if test "$softmmu" = yes ; then > virtfs=no > fi > fi > +fi > +if [ "$guest_agent" != "no" ]; then > if [ "$linux" = "yes" -o "$bsd" = "yes" -o "$solaris" = "yes" ] ; then > - if [ "$guest_agent" = "yes" ]; then > tools="qemu-ga\$(EXESUF) $tools" > - fi > + guest_agent=yes > + elif [ "$guest_agent" != yes ]; then > + guest_agent=no > + else > + error_exit "Guest agent is not supported on this platform" > fi > fi You are mixing 2- and 4-char indentation here... Andreas > >
diff --git a/configure b/configure index f0761ea..293f167 100755 --- a/configure +++ b/configure @@ -231,7 +231,7 @@ libusb="" usb_redir="" glx="" zlib="yes" -guest_agent="yes" +guest_agent="" want_tools="yes" libiscsi="" coroutine="" @@ -3444,10 +3444,15 @@ if test "$softmmu" = yes ; then virtfs=no fi fi +fi +if [ "$guest_agent" != "no" ]; then if [ "$linux" = "yes" -o "$bsd" = "yes" -o "$solaris" = "yes" ] ; then - if [ "$guest_agent" = "yes" ]; then tools="qemu-ga\$(EXESUF) $tools" - fi + guest_agent=yes + elif [ "$guest_agent" != yes ]; then + guest_agent=no + else + error_exit "Guest agent is not supported on this platform" fi fi
Move qemu-ga build check out of if softmmu.. into its own section. We want to build qemu-ga for _guest_ even if system build isn't done. It is controlled separately using --enable-guest-agent. Additionally, give error message if guest agent is requested but not supported. Signed-off-by: Michael Tokarev <mjt@tls.msk.ru> --- configure | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-)