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>
This commit is contained in:
Peter Korsgaard 2011-03-27 22:09:07 +02:00
parent 1990a9cb92
commit 07c469ed16

View File

@ -14,9 +14,7 @@ WEBKIT_CONF_ENV = ac_cv_path_icu_config=$(STAGING_DIR)/usr/bin/icu-config
ifeq ($(BR2_PACKAGE_XORG7),y) ifeq ($(BR2_PACKAGE_XORG7),y)
WEBKIT_CONF_OPT += --with-target=x11 WEBKIT_CONF_OPT += --with-target=x11
WEBKIT_DEPENDENCIES += xserver_xorg-server xlib_libXt WEBKIT_DEPENDENCIES += xserver_xorg-server xlib_libXt
endif else
ifeq ($(BR2_PACKAGE_DIRECTFB),y)
WEBKIT_CONF_OPT += --with-target=directfb WEBKIT_CONF_OPT += --with-target=directfb
WEBKIT_DEPENDENCIES += directfb WEBKIT_DEPENDENCIES += directfb
endif endif