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

Add ability to force enable/disable of tools build

Browse Source 
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 <berrange@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Daniel P. Berrange 2012-09-10 12:26:29 +01:00 committed by Anthony Liguori
parent 66d5499b37
commit 4b1c11fd20
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
configure vendored
View File

@ -217,6 +217,7 @@ usb_redir=""
opengl="" opengl=""
zlib="yes" zlib="yes"
guest_agent="yes" guest_agent="yes"
want_tools="yes"
libiscsi="" libiscsi=""
coroutine="" coroutine=""
seccomp="" seccomp=""
@ -868,6 +869,10 @@ for opt do
;; ;;
--disable-guest-agent) guest_agent="no" --disable-guest-agent) guest_agent="no"
;; ;;
--enable-tools) want_tools="yes"
;;
--disable-tools) want_tools="no"
;;
--enable-seccomp) seccomp="yes" --enable-seccomp) seccomp="yes"
;; ;;
--disable-seccomp) seccomp="no" --disable-seccomp) seccomp="no"
@ -3043,9 +3048,14 @@ fi
qemu_confdir=$sysconfdir$confsuffix qemu_confdir=$sysconfdir$confsuffix
qemu_datadir=$datadir$confsuffix qemu_datadir=$datadir$confsuffix
tools= tools=""
if test "$softmmu" = yes ; then if test "$want_tools" = "yes" ; then
tools="qemu-img\$(EXESUF) qemu-io\$(EXESUF) $tools" 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 "$virtfs" != no ; then
if test "$cap" = yes && test "$linux" = yes && test "$attr" = yes ; then if test "$cap" = yes && test "$linux" = yes && test "$attr" = yes ; then
virtfs=yes virtfs=yes
@ -3059,14 +3069,13 @@ if test "$softmmu" = yes ; then
fi fi
fi fi
if [ "$linux" = "yes" -o "$bsd" = "yes" -o "$solaris" = "yes" ] ; then if [ "$linux" = "yes" -o "$bsd" = "yes" -o "$solaris" = "yes" ] ; then
tools="qemu-nbd\$(EXESUF) $tools"
if [ "$guest_agent" = "yes" ]; then if [ "$guest_agent" = "yes" ]; then
tools="qemu-ga\$(EXESUF) $tools" tools="qemu-ga\$(EXESUF) $tools"
fi fi
fi fi
fi if test "$smartcard_nss" = "yes" ; then
if test "$smartcard_nss" = "yes" ; then tools="vscclient\$(EXESUF) $tools"
tools="vscclient\$(EXESUF) $tools" fi
fi fi
# Mac OS X ships with a broken assembler # Mac OS X ships with a broken assembler