summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnthony Liguori <aliguori@us.ibm.com>2012-04-25 14:19:05 -0500
committerAnthony Liguori <aliguori@us.ibm.com>2012-04-26 13:14:58 -0500
commitbe5ea8ed4481f0ffa4ea0f7ba13e465701536001 (patch)
tree3d705cc6b2314675d692f4ecb511309e4dd420a4
parent15fdaee3c549afb24b121e060e9852ed29d11cab (diff)
downloadqemu-be5ea8ed4481f0ffa4ea0f7ba13e465701536001.tar.gz
Revert "configure: Virtfs doesn't require libcap."
This reverts commit d10f9056bacf7991fd6a5f63ac2e0190e84ea3a7 due to a build breakage. See http://spunk.home.kraxel.org/bb/builders/ubuntu-default/builds/52 Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
-rwxr-xr-xconfigure6
1 files changed, 2 insertions, 4 deletions
diff --git a/configure b/configure
index dd09f1a18f..15bbc735c4 100755
--- a/configure
+++ b/configure
@@ -2898,11 +2898,9 @@ tools=
if test "$softmmu" = yes ; then
tools="qemu-img\$(EXESUF) qemu-io\$(EXESUF) $tools"
if test "$virtfs" != no ; then
- if test "$linux" = yes && test "$attr" = yes ; then
+ if test "$cap" = yes && test "$linux" = yes && test "$attr" = yes ; then
virtfs=yes
- if test "$cap" = yes ; then
- tools="$tools fsdev/virtfs-proxy-helper\$(EXESUF)"
- fi
+ tools="$tools fsdev/virtfs-proxy-helper\$(EXESUF)"
else
if test "$virtfs" = yes; then
feature_not_found "virtfs"