From 3d6bc866f8b1195a5c3671aa55c14684f2926fbf Mon Sep 17 00:00:00 2001
From: SeokYeon Hwang <syeon.hwang@samsung.com>
Date: Wed, 19 Aug 2015 18:16:59 +0900
Subject: [PATCH] configure: refined configure scripts

We could not see platform dependent options that is passed to configure. So
platform dependent options should be appended before it is printed. Now we
can see all options passed to configure.

Change-Id: Icf438ca94f0acb9742a2bc5c6343b76d2e5acc3c
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
---
 configure                   |  79 ++++++++++++++++---------------
 tizen/emulator_configure.sh | 112 ++++++++++++++++++++++++--------------------
 2 files changed, 101 insertions(+), 90 deletions(-)

diff --git a/configure b/configure
index 164e2a9..031ddba 100755
--- a/configure
+++ b/configure
@@ -342,9 +342,9 @@ vhdx=""
 quorum=""
 numa=""
 # for TIZEN-maru
+maru="no"
 winver="0x501"
 java_ui="no"
-maru="no"
 shm="no"
 libav=""
 libpng="no"
@@ -1492,8 +1492,8 @@ Advanced options (experts only):
   --disable-vigs           disable VIGS device
 
 TIZEN-maru options:
-  --winver=WINVER          set WINVER
   --enable-maru            enable maru board
+  --winver=WINVER          set WINVER
   --enable-java-ui         enable java UI
   --enable-shm             enable shared memory for framebuffer
   --enable-libav           enable libav library
@@ -4694,11 +4694,12 @@ echo "YaGL stats        $yagl_stats"
 echo "VIGS support      $vigs"
 
 # for TIZEN-maru
+if test "$maru" = "yes"; then
 echo "TIZEN-maru options:"
 echo "maru enabled               $maru"
-if test "$mingw32" = "yes"; then
+    if test "$mingw32" = "yes"; then
 echo "WINVER                     $winver"
-fi
+    fi
 echo "Java UI enabled            $java_ui"
 echo "shared framebuffer enabled $shm"
 echo "libav support              $libav"
@@ -4707,6 +4708,7 @@ echo "DXVA2 support              $dxva2"
 echo "vaapi support              $vaapi"
 echo "libtizenusb support        $libtizenusb"
 echo "extension path             $extension_path"
+fi
 #
 
 if test "$sdl_too_old" = "yes"; then
@@ -5812,43 +5814,44 @@ 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"
+    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 with 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
-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
 
 
diff --git a/tizen/emulator_configure.sh b/tizen/emulator_configure.sh
index d132604..ab5dbbb 100755
--- a/tizen/emulator_configure.sh
+++ b/tizen/emulator_configure.sh
@@ -76,72 +76,80 @@ if [ -z "$EMUL_TARGET_LIST" ] ; then
   set_target all
 fi
 
-# append common flags
-CONFIGURE_APPEND="--target-list=$EMUL_TARGET_LIST --enable-yagl --enable-curl --disable-gtk --disable-quorum --enable-vigs --enable-maru --enable-libav --enable-libpng --enable-qt $CONFIGURE_APPEND"
-
 if [ -z ${PKG_CONFIG_PATH} ] ; then	# avoid pkg-config bug on Windows
 export PKG_CONFIG_PATH=${TIZEN_SDK_DEV_PATH}/distrib/lib/pkgconfig
 else
 export PKG_CONFIG_PATH=${TIZEN_SDK_DEV_PATH}/distrib/lib/pkgconfig:${PKG_CONFIG_PATH}
 fi
 
+# append common options
+CONFIGURE_APPEND="
+ --target-list=$EMUL_TARGET_LIST
+ --enable-yagl
+ --enable-curl
+ --disable-gtk
+ --disable-quorum
+ --enable-vigs
+ --enable-maru
+ --enable-libav
+ --enable-libpng
+ --enable-qt
+ $CONFIGURE_APPEND"
+
+# append platform specific options
 case $targetos in
 Linux*)
-cd ..
-echo ""
-echo "##### QEMU configuring for emulator"
-echo "##### QEMU configure append:" $CONFIGURE_APPEND
-exec ./configure \
- --enable-werror \
- --extra-ldflags=-Wl,--export-dynamic \
- --audio-drv-list=alsa \
- --disable-vnc \
- --disable-pie \
- --enable-virtfs \
- --disable-xen \
- --enable-java-ui \
- $CONFIGURE_APPEND \
+CONFIGURE_APPEND="
+ --enable-werror
+ --extra-ldflags=-Wl,--export-dynamic
+ --audio-drv-list=alsa
+ --disable-vnc
+ --disable-pie
+ --enable-virtfs
+ --disable-xen
+ --enable-java-ui
+ $CONFIGURE_APPEND
+"
 ;;
 MINGW*)
-cd ..
-echo ""
-echo "##### QEMU configuring for emulator"
-echo "##### QEMU configure append:" $CONFIGURE_APPEND
-exec ./configure \
- --enable-werror \
- --extra-cflags=-Wno-error=format \
- --extra-cflags=-Wno-error=format-extra-args \
- --extra-cflags=-Wno-error=redundant-decls \
- --extra-ldflags=-Wl,--large-address-aware \
- --extra-ldflags=-Wl,--export-all-symbols \
- --cc=gcc \
- --audio-drv-list=winwave \
- --enable-hax \
- --disable-vnc \
- --enable-java-ui \
- $CONFIGURE_APPEND \
+CONFIGURE_APPEND="
+ --enable-werror
+ --extra-cflags=-Wno-error=format
+ --extra-cflags=-Wno-error=format-extra-args
+ --extra-cflags=-Wno-error=redundant-decls
+ --extra-ldflags=-Wl,--large-address-aware
+ --extra-ldflags=-Wl,--export-all-symbols
+ --cc=gcc
+ --audio-drv-list=winwave
+ --enable-hax
+ --disable-vnc
+ --enable-java-ui
+ $CONFIGURE_APPEND
+"
 ;;
 Darwin*)
+CONFIGURE_APPEND="
+ --enable-werror
+ --cc=clang
+ --cxx=clang
+ --extra-cflags=-mmacosx-version-min=10.4
+ --extra-ldflags=-lstdc++
+ --audio-drv-list=coreaudio
+ --enable-shm
+ --enable-hax
+ --disable-vnc
+ --disable-cocoa
+ --disable-sdl
+ --enable-java-ui
+ $CONFIGURE_APPEND
+"
 # FIXME: "-export_dynamic" causes error on old version clang
+# --extra-ldflags="-Xlinker -export_dynamic" \
+;;
+esac
+
 cd ..
 echo ""
 echo "##### QEMU configuring for emulator"
 echo "##### QEMU configure append:" $CONFIGURE_APPEND
-./configure \
- --enable-werror \
- --cc=clang \
- --cxx=clang \
- --extra-cflags=-mmacosx-version-min=10.4 \
- --extra-ldflags=-lstdc++ \
- --audio-drv-list=coreaudio \
- --enable-shm \
- --enable-hax \
- --disable-vnc \
- --disable-cocoa \
- --disable-sdl \
- --enable-java-ui \
- $CONFIGURE_APPEND \
-
-# --extra-ldflags="-Xlinker -export_dynamic" \
-;;
-esac
+exec ./configure $CONFIGURE_APPEND
-- 
2.7.4