Merge branch 'features/smp' into tizen_next

[sdk/emulator/qemu.git] / configure

diff --git a/configure b/configure
index fc5ec5e..20925ef 100755 (executable)
--- a/configure
+++ b/configure
@@ -1101,6 +1101,8 @@ for opt do
   ;;
   --enable-libav) libav="yes"
   ;;
+  --disable-libav) libav="no"
+  ;;
   --enable-libpng) libpng="yes"
   ;;
 #
@@ -1417,6 +1419,7 @@ TIZEN-maru options:
   --enable-maru            enable maru board
   --enable-shm             enable shared memory for framebuffer
   --enable-libav           enable libav library
+  --disable-libav          disable libav library
   --enable-libpng          enable png library
 
 NOTE: The object files are built at the place where configure is launched
@@ -3992,9 +3995,9 @@ if test "$libav" != "no"; then
         libs_softmmu="$libav_libs $libs_softmmu"
         libav="yes"
     else
-        if test "$libav" = "yes" ; then
-            feature_not_found "libav"
-        fi
+        #if test "$libav" = "yes" ; then
+        #    feature_not_found "libav"
+        #fi
         libav="no"
     fi
 
@@ -4003,9 +4006,9 @@ if test "$libav" != "no"; then
         libs_softmmu="$libav_libs $libs_softmmu"
         libav="yes"
     else
-        if test "$libav" = "yes" ; then
-            feature_not_found "libav"
-        fi
+        #if test "$libav" = "yes" ; then
+        #    feature_not_found "libav"
+        #fi
         libav="no"
     fi
 
@@ -4014,9 +4017,9 @@ if test "$libav" != "no"; then
         libs_softmmu="$libav_libs $libs_softmmu"
         libav="yes"
     else
-        if test "$libav" = "yes" ; then
-            feature_not_found "libav"
-        fi
+        #if test "$libav" = "yes" ; then
+        #    feature_not_found "libav"
+        #fi
         libav="no"
     fi
 
@@ -4025,9 +4028,9 @@ if test "$libav" != "no"; then
         libs_softmmu="$libav_libs $libs_softmmu"
         libav="yes"
     else
-        if test "$libav" = "yes" ; then
-            feature_not_found "libav"
-        fi
+        #if test "$libav" = "yes" ; then
+        #    feature_not_found "libav"
+        #fi
         libav="no"
     fi
 
@@ -4891,15 +4894,6 @@ echo "CONFIG_TRACE_FILE=$trace_file" >> $config_host_mak
 if test "$trace_default" = "yes"; then
   echo "CONFIG_TRACE_DEFAULT=y" >> $config_host_mak
 fi
-if test "$hax" = "yes" ; then
-  if test "$mingw32" = "yes" ; then
-    echo "CONFIG_HAX_BACKEND=y" >> $config_host_mak
-  elif test "$darwin" = "yes" ; then
-    echo "CONFIG_HAX_BACKEND=y" >> $config_host_mak
-  else
-    hax="no"
-  fi
-fi
 
 if test "$rdma" = "yes" ; then
   echo "CONFIG_RDMA=y" >> $config_host_mak