./configure: add option for disabling VirtFS
Signed-off-by: Meador Inge <meadori@codesourcery.com> Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
This commit is contained in:
parent
235fe3bfd4
commit
983eef5ad7
2
Makefile
2
Makefile
|
@ -40,7 +40,9 @@ HELPERS-$(CONFIG_LINUX) = qemu-bridge-helper$(EXESUF)
|
||||||
|
|
||||||
ifdef BUILD_DOCS
|
ifdef BUILD_DOCS
|
||||||
DOCS=qemu-doc.html qemu-tech.html qemu.1 qemu-img.1 qemu-nbd.8 QMP/qmp-commands.txt
|
DOCS=qemu-doc.html qemu-tech.html qemu.1 qemu-img.1 qemu-nbd.8 QMP/qmp-commands.txt
|
||||||
|
ifdef CONFIG_VIRTFS
|
||||||
DOCS+=fsdev/virtfs-proxy-helper.1
|
DOCS+=fsdev/virtfs-proxy-helper.1
|
||||||
|
endif
|
||||||
else
|
else
|
||||||
DOCS=
|
DOCS=
|
||||||
endif
|
endif
|
||||||
|
|
|
@ -121,6 +121,7 @@ docs=""
|
||||||
fdt=""
|
fdt=""
|
||||||
nptl=""
|
nptl=""
|
||||||
sdl=""
|
sdl=""
|
||||||
|
virtfs=""
|
||||||
vnc="yes"
|
vnc="yes"
|
||||||
sparse="no"
|
sparse="no"
|
||||||
uuid=""
|
uuid=""
|
||||||
|
@ -586,6 +587,10 @@ for opt do
|
||||||
;;
|
;;
|
||||||
--enable-sdl) sdl="yes"
|
--enable-sdl) sdl="yes"
|
||||||
;;
|
;;
|
||||||
|
--disable-virtfs) virtfs="no"
|
||||||
|
;;
|
||||||
|
--enable-virtfs) virtfs="yes"
|
||||||
|
;;
|
||||||
--disable-vnc) vnc="no"
|
--disable-vnc) vnc="no"
|
||||||
;;
|
;;
|
||||||
--enable-vnc) vnc="yes"
|
--enable-vnc) vnc="yes"
|
||||||
|
@ -993,6 +998,8 @@ echo " --disable-strip disable stripping binaries"
|
||||||
echo " --disable-werror disable compilation abort on warning"
|
echo " --disable-werror disable compilation abort on warning"
|
||||||
echo " --disable-sdl disable SDL"
|
echo " --disable-sdl disable SDL"
|
||||||
echo " --enable-sdl enable SDL"
|
echo " --enable-sdl enable SDL"
|
||||||
|
echo " --disable-virtfs disable VirtFS"
|
||||||
|
echo " --enable-virtfs enable VirtFS"
|
||||||
echo " --disable-vnc disable VNC"
|
echo " --disable-vnc disable VNC"
|
||||||
echo " --enable-vnc enable VNC"
|
echo " --enable-vnc enable VNC"
|
||||||
echo " --enable-cocoa enable COCOA (Mac OS X only)"
|
echo " --enable-cocoa enable COCOA (Mac OS X only)"
|
||||||
|
@ -2805,8 +2812,15 @@ confdir=$sysconfdir$confsuffix
|
||||||
tools=
|
tools=
|
||||||
if test "$softmmu" = yes ; then
|
if test "$softmmu" = yes ; then
|
||||||
tools="qemu-img\$(EXESUF) qemu-io\$(EXESUF) $tools"
|
tools="qemu-img\$(EXESUF) qemu-io\$(EXESUF) $tools"
|
||||||
if [ "$cap" = "yes" -a "$linux" = "yes" ] ; then
|
if test "$virtfs" != no ; then
|
||||||
tools="$tools fsdev/virtfs-proxy-helper\$(EXESUF)"
|
if test "$cap" = yes && test "$linux" = yes && test "$attr" = yes ; then
|
||||||
|
virtfs=yes
|
||||||
|
tools="$tools fsdev/virtfs-proxy-helper\$(EXESUF)"
|
||||||
|
else
|
||||||
|
if test "$virtfs" = yes; then
|
||||||
|
feature_not_found "virtfs"
|
||||||
|
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"
|
tools="qemu-nbd\$(EXESUF) $tools"
|
||||||
|
@ -2871,6 +2885,7 @@ echo "Audio drivers $audio_drv_list"
|
||||||
echo "Extra audio cards $audio_card_list"
|
echo "Extra audio cards $audio_card_list"
|
||||||
echo "Block whitelist $block_drv_whitelist"
|
echo "Block whitelist $block_drv_whitelist"
|
||||||
echo "Mixer emulation $mixemu"
|
echo "Mixer emulation $mixemu"
|
||||||
|
echo "VirtFS support $virtfs"
|
||||||
echo "VNC support $vnc"
|
echo "VNC support $vnc"
|
||||||
if test "$vnc" = "yes" ; then
|
if test "$vnc" = "yes" ; then
|
||||||
echo "VNC TLS support $vnc_tls"
|
echo "VNC TLS support $vnc_tls"
|
||||||
|
@ -3160,10 +3175,8 @@ fi
|
||||||
if test "$libattr" = "yes" ; then
|
if test "$libattr" = "yes" ; then
|
||||||
echo "CONFIG_LIBATTR=y" >> $config_host_mak
|
echo "CONFIG_LIBATTR=y" >> $config_host_mak
|
||||||
fi
|
fi
|
||||||
if test "$linux" = "yes" ; then
|
if test "$virtfs" = "yes" ; then
|
||||||
if test "$attr" = "yes" ; then
|
echo "CONFIG_VIRTFS=y" >> $config_host_mak
|
||||||
echo "CONFIG_VIRTFS=y" >> $config_host_mak
|
|
||||||
fi
|
|
||||||
fi
|
fi
|
||||||
if test "$blobs" = "yes" ; then
|
if test "$blobs" = "yes" ; then
|
||||||
echo "INSTALL_BLOBS=yes" >> $config_host_mak
|
echo "INSTALL_BLOBS=yes" >> $config_host_mak
|
||||||
|
|
Loading…
Reference in New Issue