gwj / at91sam9263 · Commits

Commit e0e6c8c057efab0de1b4fa90e1c40deb5b22ad20

Authored by aliguori
1 parent 89588a4b

Enable VDE by default if library is present. 

VDE isn't used unless the user explicitly asks for it so if the library is
present on the system, we should include support for it.

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>



git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@4931 c046a42c-6fe2-441c-8c8c-71466251a162
Inline Side-by-side
Showing 1 changed file with 4 additions and 8 deletions
configure
  View file @e0e6c8c
@@ -89,7 +89,7 @@ mingw32=&quot;no&quot; @@ -89,7 +89,7 @@ mingw32=&quot;no&quot;
89 EXESUF="" 89 EXESUF=""
90 gdbstub="yes" 90 gdbstub="yes"
91 slirp="yes" 91 slirp="yes"
92 -vde="no" 92 +vde="yes"
93 fmod_lib="" 93 fmod_lib=""
94 fmod_inc="" 94 fmod_inc=""
95 vnc_tls="yes" 95 vnc_tls="yes"
@@ -281,7 +281,7 @@ for opt do @@ -281,7 +281,7 @@ for opt do
281 ;; 281 ;;
282 --disable-slirp) slirp="no" 282 --disable-slirp) slirp="no"
283 ;; 283 ;;
284 - --enable-vde) vde="yes" 284 + --disable-vde) vde="no"
285 ;; 285 ;;
286 --disable-kqemu) kqemu="no" 286 --disable-kqemu) kqemu="no"
287 ;; 287 ;;
@@ -435,7 +435,7 @@ echo &quot; --fmod-lib path to FMOD library&quot; @@ -435,7 +435,7 @@ echo &quot; --fmod-lib path to FMOD library&quot;
435 echo " --fmod-inc path to FMOD includes" 435 echo " --fmod-inc path to FMOD includes"
436 echo " --enable-uname-release=R Return R for uname -r in usermode emulation" 436 echo " --enable-uname-release=R Return R for uname -r in usermode emulation"
437 echo " --sparc_cpu=V Build qemu for Sparc architecture v7, v8, v8plus, v8plusa, v9" 437 echo " --sparc_cpu=V Build qemu for Sparc architecture v7, v8, v8plus, v8plusa, v9"
438 -echo " --enable-vde enable support for vde network [$vde]" 438 +echo " --disable-vde disable support for vde network"
439 echo "" 439 echo ""
440 echo "NOTE: The object files are built at the place where configure is launched" 440 echo "NOTE: The object files are built at the place where configure is launched"
441 exit 1 441 exit 1
@@ -735,11 +735,7 @@ EOF @@ -735,11 +735,7 @@ EOF
735 if $cc $ARCH_CFLAGS -o $TMPE $TMPC 2> /dev/null ; then 735 if $cc $ARCH_CFLAGS -o $TMPE $TMPC 2> /dev/null ; then
736 : 736 :
737 else 737 else
738 - echo  
739 - echo "Error: VDE check failed"  
740 - echo "Make sure to have the VDE libs and headers installed."  
741 - echo  
742 - exit 1 738 + vde="no"
743 fi 739 fi
744 fi 740 fi
745 741