"Daniel P. Berrange" <berra...@redhat.com> writes: > From: "Daniel P. Berrange" <berra...@redhat.com> > > The qemu-img, qemu-nbd and qemu-io tools are built conditionally > based on whether any softmmu target is enabled. These are useful > self-contained tools which can be used in many other scenarios. > Add new --enable-tools/--disable-tools args to configure to allow > the user to explicitly turn on / off their build. The default > behaviour is now to build these tools are all times, regardless > of whether any softmmu target is enabled > > Signed-off-by: Daniel P. Berrange <berra...@redhat.com>
Applied. Thanks. Regards, Anthony Liguori > --- > configure | 21 +++++++++++++++------ > 1 file changed, 15 insertions(+), 6 deletions(-) > > diff --git a/configure b/configure > index d97fd81..75dc9da 100755 > --- a/configure > +++ b/configure > @@ -216,6 +216,7 @@ usb_redir="" > opengl="" > zlib="yes" > guest_agent="yes" > +want_tools="yes" > libiscsi="" > coroutine="" > seccomp="" > @@ -865,6 +866,10 @@ for opt do > ;; > --disable-guest-agent) guest_agent="no" > ;; > + --enable-tools) want_tools="yes" > + ;; > + --disable-tools) want_tools="no" > + ;; > --enable-seccomp) seccomp="yes" > ;; > --disable-seccomp) seccomp="no" > @@ -3039,9 +3044,14 @@ fi > qemu_confdir=$sysconfdir$confsuffix > qemu_datadir=$datadir$confsuffix > > -tools= > -if test "$softmmu" = yes ; then > +tools="" > +if test "$want_tools" = "yes" ; then > tools="qemu-img\$(EXESUF) qemu-io\$(EXESUF) $tools" > + if [ "$linux" = "yes" -o "$bsd" = "yes" -o "$solaris" = "yes" ] ; then > + tools="qemu-nbd\$(EXESUF) $tools" > + fi > +fi > +if test "$softmmu" = yes ; then > if test "$virtfs" != no ; then > if test "$cap" = yes && test "$linux" = yes && test "$attr" = yes ; then > virtfs=yes > @@ -3055,14 +3065,13 @@ if test "$softmmu" = yes ; then > fi > fi > if [ "$linux" = "yes" -o "$bsd" = "yes" -o "$solaris" = "yes" ] ; then > - tools="qemu-nbd\$(EXESUF) $tools" > if [ "$guest_agent" = "yes" ]; then > tools="qemu-ga\$(EXESUF) $tools" > fi > fi > -fi > -if test "$smartcard_nss" = "yes" ; then > - tools="vscclient\$(EXESUF) $tools" > + if test "$smartcard_nss" = "yes" ; then > + tools="vscclient\$(EXESUF) $tools" > + fi > fi > > # Mac OS X ships with a broken assembler > -- > 1.7.11.2
