configure: disable curl as a default

"curl" is used as a block device in QEMU. And now we disable curl support
since we never use it.

Change-Id: I83c9b01b0db88655f84c143c382f7201f6614005
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
(cherry picked from commit 009ad50d807d422057504ad9a15d5639641be6c2)

diff --git a/tizen/emulator_configure.sh b/tizen/emulator_configure.sh
index f8a5b8009111fa7f32e941072f857f8c45b845bd..907c43800cb4d2b5f82d5dc134dd42bb35845b8c 100755 (executable)
--- a/tizen/emulator_configure.sh
+++ b/tizen/emulator_configure.sh
@@ -103,23 +103,30 @@ fi
 # append common options
 CONFIGURE_APPEND="
  --target-list=$EMUL_TARGET_LIST
+ --enable-werror
+ --enable-maru
  --enable-yagl
- --enable-curl
- --disable-gtk
- --disable-quorum
  --enable-vigs
- --enable-maru
+ --enable-qt
  --enable-libav
  --enable-libpng
- --enable-qt
+ --enable-virtfs
  --enable-java-ui
+ --disable-curl
+ --disable-lzo
+ --disable-snappy
+ --disable-gtk
+ --disable-vnc
+ --disable-spice
+ --disable-curses
+ --disable-xen
+ --disable-quorum
  $CONFIGURE_APPEND"
 
 # append platform specific options
 case $targetos in
 Linux*)
 CONFIGURE_APPEND="
- --enable-werror
  --extra-ldflags=-Wl,--export-dynamic
  --audio-drv-list=alsa
  --disable-vnc
@@ -133,7 +140,6 @@ CONFIGURE_APPEND="
 CROSS_MINGW*)
 CONFIGURE_APPEND="
  --cross-prefix=${CROSS_PREFIX}-
- --enable-werror
  --extra-ldflags=-Wl,--large-address-aware
  --extra-ldflags=-Wl,--export-all-symbols
  --audio-drv-list=winwave
@@ -148,7 +154,6 @@ MINGW*)
 # Some "-Wno-error" is requisite for legacy MinGW (not MinGW-w64)
 CONFIGURE_APPEND="
  --cc=gcc
- --enable-werror
  --extra-cflags=-Wno-error=format
  --extra-cflags=-Wno-error=format-extra-args
  --extra-cflags=-Wno-error=redundant-decls
@@ -164,7 +169,6 @@ CONFIGURE_APPEND="
 ;;
 Darwin*)
 CONFIGURE_APPEND="
- --enable-werror
  --cc=clang
  --cxx=clang
  --extra-cflags=-mmacosx-version-min=10.4

diff --git a/tizen/src/Makefile b/tizen/src/Makefile
index 8c56befe9bdbd587462a6ebdf719b4906b7426f9..d6bcd08e2cb62e2b1857a4fc86840d6c817dac1b 100755 (executable)
--- a/tizen/src/Makefile
+++ b/tizen/src/Makefile
@@ -254,7 +254,7 @@ endif
 
 # change loading path of dynamic shared libraries on MAC OS X
 ifdef CONFIG_DARWIN
-       @LIB_LIST="libgthread-2.0.0.dylib libglib-2.0.0.dylib libintl.8.dylib libgcc_s.1.dylib libz.1.dylib libcurl.4.dylib libgcc_s.1.dylib libcurl.4.dylib libx264.142.dylib libncurses.5.dylib libpixman-1.0.dylib libpng16.16.dylib QtOpenGL QtWidgets QtGui QtCore"; \
+       @LIB_LIST="libgthread-2.0.0.dylib libglib-2.0.0.dylib libintl.8.dylib libgcc_s.1.dylib libz.1.dylib libx264.142.dylib libncurses.5.dylib libpixman-1.0.dylib libpng16.16.dylib QtOpenGL QtWidgets QtGui QtCore"; \
        for target in $(TARGET_DIRS); do \
        case "$$target" in \
        i386-softmmu) \

diff --git a/tizen/src/emulator_legacy.c b/tizen/src/emulator_legacy.c
index f07741acffdf78254beb18c6e09d58c60c201f37..90bab390bcad26d90bcf6d9acd6b7c64dd488019 100644 (file)
--- a/tizen/src/emulator_legacy.c
+++ b/tizen/src/emulator_legacy.c
@@ -40,7 +40,6 @@
 #include "emulator_options.h"
 #include "emul_state.h"
 #include "hw/virtio/maru_virtio_touchscreen.h"
-#include "util/check_gl.h"
 #include "util/error_handler.h"
 #include "display/maru_display.h"
 #include "util/osutil.h"

diff --git a/tizen/src/util/osutil.c b/tizen/src/util/osutil.c
index 03832df022b48b1c01660d7970e7167c7f712325..4c027e72601bd1224d650d23f2bd92c4dd806a70 100644 (file)
--- a/tizen/src/util/osutil.c
+++ b/tizen/src/util/osutil.c
@@ -37,7 +37,6 @@
 #include "osutil.h"
 #include "debug_ch.h"
 
-#include <curl/curl.h>
 #include <string.h>