summaryrefslogtreecommitdiff
path: root/package/webkit
diff options
context:
space:
mode:
authorPeter Korsgaard <jacmet@sunsite.dk>2011-03-27 22:09:07 +0200
committerPeter Korsgaard <jacmet@sunsite.dk>2011-03-27 22:09:07 +0200
commit07c469ed169e3ac8b6038a9699bc930de457405c (patch)
tree4e893069a75df3a34f0c43c230c853a7635c15d1 /package/webkit
parent1990a9cb926cfe41de482ae803d8e6d8c396ec6c (diff)
webkit: prefer X11 backend if both directfb and x11 are available
This shouldn't happen with any sane configuration, but is possible with randpackageconfig builds, where it breaks the build as libgtk would prefer X11 and webkit directfb, causing it to fail with: No package 'gtk+-directfb-2.0' found Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Diffstat (limited to 'package/webkit')
-rw-r--r--package/webkit/webkit.mk4
1 files changed, 1 insertions, 3 deletions
diff --git a/package/webkit/webkit.mk b/package/webkit/webkit.mk
index 6ab609bf2..8483c0dc3 100644
--- a/package/webkit/webkit.mk
+++ b/package/webkit/webkit.mk
@@ -14,9 +14,7 @@ WEBKIT_CONF_ENV = ac_cv_path_icu_config=$(STAGING_DIR)/usr/bin/icu-config
ifeq ($(BR2_PACKAGE_XORG7),y)
WEBKIT_CONF_OPT += --with-target=x11
WEBKIT_DEPENDENCIES += xserver_xorg-server xlib_libXt
-endif
-
-ifeq ($(BR2_PACKAGE_DIRECTFB),y)
+else
WEBKIT_CONF_OPT += --with-target=directfb
WEBKIT_DEPENDENCIES += directfb
endif