diff options
Diffstat (limited to 'package/webkit')
| -rw-r--r-- | package/webkit/Config.in | 21 | ||||
| -rw-r--r-- | package/webkit/webkit.mk | 11 |
2 files changed, 8 insertions, 24 deletions
diff --git a/package/webkit/Config.in b/package/webkit/Config.in index 10c8b38ac..b0d69d787 100644 --- a/package/webkit/Config.in +++ b/package/webkit/Config.in @@ -2,7 +2,7 @@ config BR2_PACKAGE_WEBKIT bool "webkit" depends on BR2_INSTALL_LIBSTDCPP depends on BR2_USE_WCHAR - select BR2_PACKAGE_LIBGTK2 + depends on BR2_PACKAGE_LIBGTK2 select BR2_PACKAGE_ICU select BR2_PACKAGE_CURL select BR2_PACKAGE_LIBXML2 @@ -21,22 +21,3 @@ config BR2_PACKAGE_WEBKIT comment "webkit requires a toolchain with C++ support and WCHAR enabled" depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR - -if BR2_PACKAGE_WEBKIT - -choice - prompt "Rendering target" - default BR2_PACKAGE_WEBKIT_X - help - Selects which rendering target will be used. - -config BR2_PACKAGE_WEBKIT_X11 - bool "X11" - -config BR2_PACKAGE_WEBKIT_DIRECTFB - bool "DirectFB" - select BR2_PACKAGE_DIRECTFB - -endchoice - -endif diff --git a/package/webkit/webkit.mk b/package/webkit/webkit.mk index 2121f4b06..39debd362 100644 --- a/package/webkit/webkit.mk +++ b/package/webkit/webkit.mk @@ -14,12 +14,15 @@ WEBKIT_LIBTOOL_PATCH = NO WEBKIT_DEPENDENCIES = host-flex host-gperf icu curl libxml2 libxslt \ libgtk2 sqlite enchant libsoup -ifeq ($(BR2_PACKAGE_WEBKIT_X11),y) -WEBKIT_CONF_OPT = --with-target=x11 + +ifeq ($(BR2_PACKAGE_XORG7),y) + WEBKIT_CONF_OPT += --with-target=x11 + WEBKIT_DEPENDENCIES += xserver_xorg-server endif -ifeq ($(BR2_PACKAGE_WEBKIT_DIRECTFB),y) -WEBKIT_CONF_OPT = --with-target=directfb +ifeq ($(BR2_PACKAGE_DIRECTFB),y) + WEBKIT_CONF_OPT += --with-target=directfb + WEBKIT_DEPENDENCIES += directfb endif WEBKIT_CONF_OPT += --disable-video |