From 07c469ed169e3ac8b6038a9699bc930de457405c Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sun, 27 Mar 2011 22:09:07 +0200 Subject: 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 --- package/webkit/webkit.mk | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'package/webkit') 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 -- cgit v1.2.3