configure: enabling java ui explicitly

Now we can also disable java ui explicitly.

Change-Id: I7fbe217ff92b1e2594d62ba6b8a99e20eb7a8a29
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>

diff --git a/configure b/configure
index 5d0a966b6e7efc4283c9257a84c3142032b1e906..06b886e40d9cd4fe1a71d16e427b5e962985f73f 100755 (executable)
--- a/configure
+++ b/configure
@@ -331,6 +331,7 @@ coroutine_pool=""
 seccomp=""
 
 # for TIZEN-maru
+java_ui="no"
 maru="no"
 shm="no"
 libav=""
@@ -1135,6 +1136,8 @@ for opt do
 # for TIZEN-maru
   --enable-maru) maru="yes"
   ;;
+  --enable-java-ui) java_ui="yes"
+  ;;
   --enable-shm) shm="yes"
   ;;
   --enable-libav) libav="yes"
@@ -1488,6 +1491,7 @@ Advanced options (experts only):
 
 TIZEN-maru options:
   --enable-maru            enable maru board
+  --enable-java-ui         enable java UI
   --enable-shm             enable shared memory for framebuffer
   --enable-libav           enable libav library
   --disable-libav          disable libav library
@@ -4662,6 +4666,7 @@ echo "VIGS support      $vigs"
 
 # for TIZEN-maru
 echo "TIZEN-maru support $maru"
+echo "TIZEN-maru Java UI support $java_ui"
 echo "TIZEN-maru shared framebuffer support $shm"
 echo "TIZEN-maru libav support $libav"
 echo "TIZEN-maru libpng support $libpng"
@@ -5171,8 +5176,20 @@ fi
 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
-  echo "CONFIG_USE_SHM=y" >> $config_host_mak
+  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
@@ -5193,12 +5210,6 @@ fi
 if [ ! -z "$extension_path" ] ; then
   echo "CONFIG_EXTENSION_PATH=$extension_path" >> $config_host_mak
 fi
-# java skin is deprecated
-if test "$maru" = "yes" ; then
-  if test "$shm" = "yes" || test "$sdl" = "yes" ; then
-    echo "CONFIG_JAVA_UI=y" >> $config_host_mak
-  fi
-fi
 
 # TPM passthrough support?
 if test "$tpm" = "yes"; then

diff --git a/tizen/emulator_configure.sh b/tizen/emulator_configure.sh
index 18bd342e85525026f7a986044f3109c4c1ca6115..d1326040ff3ef9537513165feb256b487339fb2f 100755 (executable)
--- a/tizen/emulator_configure.sh
+++ b/tizen/emulator_configure.sh
@@ -99,6 +99,7 @@ exec ./configure \
  --disable-pie \
  --enable-virtfs \
  --disable-xen \
+ --enable-java-ui \
  $CONFIGURE_APPEND \
 ;;
 MINGW*)
@@ -117,6 +118,7 @@ exec ./configure \
  --audio-drv-list=winwave \
  --enable-hax \
  --disable-vnc \
+ --enable-java-ui \
  $CONFIGURE_APPEND \
 ;;
 Darwin*)
@@ -137,6 +139,7 @@ echo "##### QEMU configure append:" $CONFIGURE_APPEND
  --disable-vnc \
  --disable-cocoa \
  --disable-sdl \
+ --enable-java-ui \
  $CONFIGURE_APPEND \
 
 # --extra-ldflags="-Xlinker -export_dynamic" \