configure: cleaned-up "configure" file

Change-Id: I01598f239ca61655f7deddfcba8e5124ab219ffa

diff --git a/configure b/configure
index 0c98baccbda49e38c8c271213809cf8323e5fa5d..213d86203892a251a4d6192484feab6ae98fd111 100755 (executable)
--- a/configure
+++ b/configure
@@ -311,7 +311,6 @@ smartcard_nss=""
 libusb=""
 libtizenusb="no"
 usb_redir=""
-opengl=""
 efence="no"
 yagl="no"
 yagl_stats="no"
@@ -330,19 +329,6 @@ libnfs=""
 coroutine=""
 coroutine_pool=""
 seccomp=""
-
-# for TIZEN-maru
-java_ui="no"
-maru="no"
-shm="no"
-libav=""
-libpng="no"
-dxva2=""
-vaapi=""
-qt="no"
-qtabi="5.0"
-extension_path=""
-#
 glusterfs=""
 glusterfs_discard="no"
 glusterfs_zerofill="no"
@@ -355,6 +341,18 @@ libssh2=""
 vhdx=""
 quorum=""
 numa=""
+# for TIZEN-maru
+java_ui="no"
+maru="no"
+shm="no"
+libav=""
+libpng="no"
+dxva2=""
+vaapi=""
+qt="no"
+qtabi="5.0"
+extension_path=""
+#
 
 # parse CC options first
 for opt do
@@ -1064,14 +1062,10 @@ for opt do
   ;;
   --disable-yagl-stats) yagl_stats="no"
   ;;
-  --enable-opengl) opengl="yes"
-  ;;
   --enable-vigs) vigs="yes"
   ;;
   --disable-vigs) vigs="no"
   ;;
-  --disable-opengl) opengl="no"
-  ;;
   --disable-vhost-scsi) vhost_scsi="no"
   ;;
   --enable-vhost-scsi) vhost_scsi="yes"
@@ -1138,34 +1132,6 @@ for opt do
   ;;
   --disable-seccomp) seccomp="no"
   ;;
-# for TIZEN-maru
-  --enable-maru) maru="yes"
-  ;;
-  --enable-java-ui) java_ui="yes"
-  ;;
-  --enable-shm) shm="yes"
-  ;;
-  --enable-libav) libav="yes"
-  ;;
-  --disable-libav) libav="no"
-  ;;
-  --enable-libpng) libpng="yes"
-  ;;
-  --enable-dxva2) dxva2="yes"
-  ;;
-  --disable-dxva2) dxva2="no"
-  ;;
-  --enable-vaapi) vaapi="yes"
-  ;;
-  --disable-vaapi) vaapi="no"
-  ;;
-  --disable-qt) qt="no"
-  ;;
-  --enable-qt) qt="yes"
-  ;;
-  --extension-path=*) extension_path="$optarg"
-  ;;
-#
   --disable-glusterfs) glusterfs="no"
   ;;
   --enable-glusterfs) glusterfs="yes"
@@ -1211,6 +1177,34 @@ for opt do
   ;;
   --enable-numa) numa="yes"
   ;;
+# for TIZEN-maru
+  --enable-maru) maru="yes"
+  ;;
+  --enable-java-ui) java_ui="yes"
+  ;;
+  --enable-shm) shm="yes"
+  ;;
+  --enable-libav) libav="yes"
+  ;;
+  --disable-libav) libav="no"
+  ;;
+  --enable-libpng) libpng="yes"
+  ;;
+  --enable-dxva2) dxva2="yes"
+  ;;
+  --disable-dxva2) dxva2="no"
+  ;;
+  --enable-vaapi) vaapi="yes"
+  ;;
+  --disable-vaapi) vaapi="no"
+  ;;
+  --disable-qt) qt="no"
+  ;;
+  --enable-qt) qt="yes"
+  ;;
+  --extension-path=*) extension_path="$optarg"
+  ;;
+#
   *)
       echo "ERROR: unknown option $opt"
       echo "Try '$0 --help' for more information"
@@ -4686,7 +4680,6 @@ echo "NUMA host support $numa"
 echo "HAX support       $hax"
 echo "YaGL support      $yagl"
 echo "YaGL stats        $yagl_stats"
-echo "OpenGL support    $opengl"
 echo "VIGS support      $vigs"
 
 # for TIZEN-maru
@@ -5200,48 +5193,6 @@ else
   echo "HOST_USB=stub" >> $config_host_mak
 fi
 
-# for TIZEN-maru
-if test "$maru" = "yes" ; then
-  echo "CONFIG_MARU=y" >> $config_host_mak
-fi
-# java ui is deprecated
-if test "$java_ui" = "yes" ; then
-  if test "$shm" = "yes" || test "$sdl" = "yes" ; then
-    echo "CONFIG_JAVA_UI=y" >> $config_host_mak
-  else
-    error_exit "Java UI is only available with SDL or SHM"
-  fi
-fi
-if test "$shm" = "yes" ; then
-  if test "$java_ui" = "yes" ; then
-    echo "CONFIG_USE_SHM=y" >> $config_host_mak
-  else
-    error_exit "SHM is only available whith Java UI"
-  fi
-fi
-if test "$libav" = "yes" ; then
-  echo "CONFIG_LIBAV=y" >> $config_host_mak
-  echo "LIBAV_CFLAGS=$libav_cflags" >> $config_host_mak
-  echo "LIBAV_LIBS=$libav_libs" >> $config_host_mak
-fi
-if test "$libpng" = "yes" ; then
-  echo "CONFIG_PNG=y" >> $config_host_mak
-  echo "LIBPNG_CFLAGS=$libpng_cflags" >> $config_host_mak
-fi
-if test "$dxva2" = "yes" ; then
-  echo "CONFIG_DXVA2=y" >> $config_host_mak
-fi
-if test "$vaapi" = "yes" ; then
-  echo "CONFIG_VAAPI=y" >> $config_host_mak
-  echo "LIBVA_CFLAGS=$libva_cflags $libva_x11_cflags" >> $config_host_mak
-fi
-if test "$libtizenusb" = "yes" ; then
-  echo "CONFIG_TIZENUSB=y" >> $config_host_mak
-fi
-if [ ! -z "$extension_path" ] ; then
-  echo "CONFIG_EXTENSION_PATH=$extension_path" >> $config_host_mak
-fi
-
 # TPM passthrough support?
 if test "$tpm" = "yes"; then
   echo 'CONFIG_TPM=$(CONFIG_SOFTMMU)' >> $config_host_mak
@@ -5843,6 +5794,49 @@ if test "$numa" = "yes"; then
   echo "CONFIG_NUMA=y" >> $config_host_mak
 fi
 
+# for TIZEN-maru
+if test "$maru" = "yes" ; then
+  echo "CONFIG_MARU=y" >> $config_host_mak
+fi
+# java ui is deprecated
+if test "$java_ui" = "yes" ; then
+  if test "$shm" = "yes" || test "$sdl" = "yes" ; then
+    echo "CONFIG_JAVA_UI=y" >> $config_host_mak
+  else
+    error_exit "Java UI is only available with SDL or SHM"
+  fi
+fi
+if test "$shm" = "yes" ; then
+  if test "$java_ui" = "yes" ; then
+    echo "CONFIG_USE_SHM=y" >> $config_host_mak
+  else
+    error_exit "SHM is only available whith Java UI"
+  fi
+fi
+if test "$libav" = "yes" ; then
+  echo "CONFIG_LIBAV=y" >> $config_host_mak
+  echo "LIBAV_CFLAGS=$libav_cflags" >> $config_host_mak
+  echo "LIBAV_LIBS=$libav_libs" >> $config_host_mak
+fi
+if test "$libpng" = "yes" ; then
+  echo "CONFIG_PNG=y" >> $config_host_mak
+  echo "LIBPNG_CFLAGS=$libpng_cflags" >> $config_host_mak
+fi
+if test "$dxva2" = "yes" ; then
+  echo "CONFIG_DXVA2=y" >> $config_host_mak
+fi
+if test "$vaapi" = "yes" ; then
+  echo "CONFIG_VAAPI=y" >> $config_host_mak
+  echo "LIBVA_CFLAGS=$libva_cflags $libva_x11_cflags" >> $config_host_mak
+fi
+if test "$libtizenusb" = "yes" ; then
+  echo "CONFIG_TIZENUSB=y" >> $config_host_mak
+fi
+if [ ! -z "$extension_path" ] ; then
+  echo "CONFIG_EXTENSION_PATH=$extension_path" >> $config_host_mak
+fi
+
+
 # build tree in object directory in case the source is not in the current directory
 DIRS="tests tests/tcg tests/tcg/cris tests/tcg/lm32 tests/libqos tests/qapi-schema tests/tcg/xtensa tests/qemu-iotests"
 DIRS="$DIRS fsdev"