diff options
| author | Peter Korsgaard <jacmet@sunsite.dk> | 2010-05-25 23:25:37 +0200 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2010-05-25 23:25:37 +0200 |
| commit | 0f4d293c30d45cb86e06216da2a9bdf55c9d9b01 (patch) | |
| tree | 63a36c382c4b3e24107ac64b1dc26802289a50fc /package/webkit/webkit.mk | |
| parent | 4059a814bb133d4dc306a366cdeba186cb7b8b89 (diff) | |
webkit: remove user visible rendering target selection
Instead use the same logic as in libgtk2. The rendering target selected
MUST be the same as libgtk2's, so just figure it out automatically
instead.
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Diffstat (limited to 'package/webkit/webkit.mk')
| -rw-r--r-- | package/webkit/webkit.mk | 11 |
1 files changed, 7 insertions, 4 deletions
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 |