webkit: prefer X11 backend if both directfb and x11 are available
authorPeter Korsgaard <jacmet@sunsite.dk>
Sun, 27 Mar 2011 20:09:07 +0000 (22:09 +0200)
committerPeter Korsgaard <jacmet@sunsite.dk>
Sun, 27 Mar 2011 20:09:07 +0000 (22:09 +0200)
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>
package/webkit/webkit.mk

index 6ab609bf26cafda05bc280b24e9cdab00306f0f1..8483c0dc35f268dab8bb6fd02eab376305399656 100644 (file)
@@ -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