From 8bd11f37c4727ae62009147cbb2d93e217918e95 Mon Sep 17 00:00:00 2001
From: Justin Clift <jclift@redhat.com>
Date: Thu, 30 Sep 2010 00:14:07 +1000
Subject: [PATCH] configure: tweak logic flow of virtport check

This fixes a small logic bug, where passing --without-macvtap
on the configure line, or otherwise indicating a lack of
support for macvtap, causes configure to bail.
---
 configure.ac | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index ee6f9b180b..6c4e828621 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2083,10 +2083,21 @@ AC_ARG_WITH([virtualport],
   [with_virtualport=${withval}],
   [with_virtualport=check])
 
-if test "$with_virtualport" != "no"; then
+dnl Warn the user and error out if they requested virtualport support with configure
+dnl options, but the required macvtap support isn't available
+
+if test "$with_virtualport" = "yes"; then
     if test "$with_macvtap" = "no"; then
         AC_MSG_ERROR([--with-virtualport requires --with-macvtap])
     fi
+fi
+
+dnl virtualport checks
+
+if test "$with_macvtap" != "yes"; then
+    with_virtualport=no
+fi
+if test "$with_virtualport" != "no"; then
     AC_MSG_CHECKING([whether to compile with virtual port support])
     AC_TRY_COMPILE([ #include <sys/socket.h>
                      #include <linux/rtnetlink.h> ],