1 files changed, 9 insertions, 35 deletions
diff --git a/Source/cmake/OptionsEfl.cmake b/Source/cmake/OptionsEfl.cmake
index f7195df31..42d28b847 100644
--- a/Source/cmake/OptionsEfl.cmake
+++ b/Source/cmake/OptionsEfl.cmake
@@ -15,12 +15,6 @@ ADD_DEFINITIONS(-DWTF_PLATFORM_EFL=1)
 SET(WTF_PLATFORM_EFL 1)
 
 # -----------------------------------------------------------------------------
-# Determine which network backend will be used
-# -----------------------------------------------------------------------------
-SET(ALL_NETWORK_BACKENDS soup curl)
-SET(NETWORK_BACKEND "soup" CACHE STRING "choose which network backend to use (one of ${ALL_NETWORK_BACKENDS})")
-
-# -----------------------------------------------------------------------------
 # Determine which font backend will be used
 # -----------------------------------------------------------------------------
 SET(ALL_FONT_BACKENDS freetype pango)
@@ -37,6 +31,14 @@ FIND_PACKAGE(Threads REQUIRED)
 FIND_PACKAGE(JPEG REQUIRED)
 FIND_PACKAGE(PNG REQUIRED)
 
+FIND_PACKAGE(Glib REQUIRED)
+FIND_PACKAGE(Gthread REQUIRED)
+FIND_PACKAGE(LibSoup2 2.37.2.1 REQUIRED)
+SET(ENABLE_GLIB_SUPPORT ON)
+
+SET(WTF_USE_SOUP 1)
+ADD_DEFINITIONS(-DWTF_USE_SOUP=1)
+
 ADD_DEFINITIONS(-DENABLE_CONTEXT_MENUS=0)
 
 SET(WTF_USE_PTHREADS 1)
@@ -73,7 +75,6 @@ WEBKIT_FEATURE(ENABLE_FILTERS "Enable SVG filters" DEFAULT ON)
 WEBKIT_FEATURE(ENABLE_FTPDIR "Enable FTP directory support" DEFAULT ON)
 WEBKIT_FEATURE(ENABLE_FULLSCREEN_API "Enable Fullscreen API support" DEFAULT OFF)
 WEBKIT_FEATURE(ENABLE_GEOLOCATION "Enable geolocation" DEFAULT OFF)
-WEBKIT_FEATURE(ENABLE_GLIB_SUPPORT "Enable Glib support" DEFAULT ON)
 WEBKIT_FEATURE(ENABLE_ICONDATABASE "Enable icon database" DEFAULT ON)
 WEBKIT_FEATURE(ENABLE_INSPECTOR "Enable inspector" DEFAULT ON)
 WEBKIT_FEATURE(ENABLE_JAVASCRIPT_DEBUGGER "Enable JavaScript debugger" DEFAULT ON)
@@ -94,6 +95,7 @@ WEBKIT_FEATURE(ENABLE_SVG "Enable SVG" DEFAULT ON)
 WEBKIT_FEATURE(ENABLE_SVG_FONTS "Enable SVG fonts" DEFAULT ON)
 WEBKIT_FEATURE(ENABLE_TOUCH_EVENTS "Enable Touch Events" DEFAULT OFF)
 WEBKIT_FEATURE(ENABLE_TOUCH_ICON_LOADING "Enable Touch Icon Loading" DEFAULT OFF)
+WEBKIT_FEATURE(ENABLE_VIBRATION "Enable vibration" DEFAULT ON)
 WEBKIT_FEATURE(ENABLE_VIDEO "Enable video" DEFAULT ON)
 WEBKIT_FEATURE(ENABLE_WEB_SOCKETS "Enable web sockets" DEFAULT ON)
 WEBKIT_FEATURE(ENABLE_WEBGL "Enable WebGL" DEFAULT OFF)
@@ -110,21 +112,6 @@ IF (ENABLE_ECORE_X)
     ENDIF ()
 ENDIF ()
 
-IF (NETWORK_BACKEND STREQUAL "soup")
-  IF (NOT ENABLE_GLIB_SUPPORT)
-    SET(ENABLE_GLIB_SUPPORT 1)
-    MESSAGE("Forcing Glib support")
-  ENDIF ()
-  FIND_PACKAGE(LibSoup2 2.33.4 REQUIRED)
-  SET(WTF_USE_SOUP 1)
-  ADD_DEFINITIONS(-DWTF_USE_SOUP=1)
-ELSE ()
-  FIND_PACKAGE(CURL REQUIRED)
-  FIND_PACKAGE(ZLIB REQUIRED)
-  SET(WTF_USE_CURL 1)
-  ADD_DEFINITIONS(-DWTF_USE_CURL=1)
-ENDIF ()
-
 IF (FONT_BACKEND STREQUAL "freetype")
   FIND_PACKAGE(Freetype REQUIRED)
   FIND_PACKAGE(ZLIB REQUIRED)
@@ -134,11 +121,6 @@ ELSE ()
   FIND_PACKAGE(Pango REQUIRED)
   SET(WTF_USE_PANGO 1)
   ADD_DEFINITIONS(-DWTF_USE_PANGO=1)
-
-  IF (NOT ENABLE_GLIB_SUPPORT)
-    SET(ENABLE_GLIB_SUPPORT 1)
-    MESSAGE("Forcing Glib support")
-  ENDIF ()
 ENDIF ()
 
 IF (NOT ENABLE_SVG)
@@ -146,9 +128,6 @@ IF (NOT ENABLE_SVG)
 ENDIF ()
 
 IF (ENABLE_VIDEO)
-  SET(ENABLE_GLIB_SUPPORT 1)
-  MESSAGE("Forcing Glib support")
-
   FIND_PACKAGE(GStreamer REQUIRED)
   FIND_PACKAGE(GStreamer-App REQUIRED)
   FIND_PACKAGE(GStreamer-Base REQUIRED)
@@ -160,11 +139,6 @@ IF (ENABLE_VIDEO)
   ADD_DEFINITIONS(-DWTF_USE_GSTREAMER=1)
 ENDIF()
 
-IF (ENABLE_GLIB_SUPPORT)
-  FIND_PACKAGE(Glib REQUIRED)
-  FIND_PACKAGE(Gthread REQUIRED)
-ENDIF ()
-
 IF (ENABLE_WEBGL)
   FIND_PACKAGE(OpenGL REQUIRED)
 ENDIF ()