From be5ea8ed4481f0ffa4ea0f7ba13e465701536001 Mon Sep 17 00:00:00 2001
From: Anthony Liguori <aliguori@us.ibm.com>
Date: Wed, 25 Apr 2012 14:19:05 -0500
Subject: [PATCH] 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>
---
 configure | 6 ++----
 1 file 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"