Commit 6beeb755 authored by Thomas Petazzoni's avatar Thomas Petazzoni
Browse files

xorg: use BR2_PACKAGE_XORG instead of BR2_PACKAGE_XSERVER_none 



The BR2_PACKAGE_XSERVER_none option has gone, so use BR2_PACKAGE_XORG7
instead. It is more logical to test if BR2_PACKAGE_XORG7 is set to
know if an X.org server is available, than testing if
BR2_PACKAGE_XSERVER_none is set to know if an X.org server is *not*
available.

Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
parent f2d8a44f

package/atk/atk.mk

+1 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ ATK_CONF_OPT = --enable-shared \ 
		--disable-glibtest --enable-explicit-deps=no \

		--disable-debug



ifneq ($(BR2_PACKAGE_XSERVER_none),y)

ifeq ($(BR2_PACKAGE_XORG7),y)

ATK_CONF_OPT += --with-x \

		--x-includes=$(STAGING_DIR)/usr/include/X11 \

		--x-libraries=$(STAGING_DIR)/usr/lib --disable-glibtest

package/cairo/cairo.mk

+1 −1
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ else 
	CAIRO_CONF_OPT += --disable-directfb

endif



ifneq ($(BR2_PACKAGE_XSERVER_none),y)

ifeq ($(BR2_PACKAGE_XORG7),y)

	CAIRO_CONF_OPT += --enable-xlib --with-x

	CAIRO_DEPENDENCIES += $(XSERVER)

else

package/cups/cups.mk

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ else 
	CUPS_CONF_OPT += --disable-dbus

endif



ifneq ($(BR2_PACKAGE_XSERVER_none),y)

ifeq ($(BR2_PACKAGE_XORG7),y)

	CUPS_DEPENDENCIES += xlib_libX11

endif

package/directfb/Config.in

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ config BR2_PACKAGE_DIRECTFB_MULTI 
config BR2_PACKAGE_DIRECTFB_XSERVER

	bool "build with X server backend"

	depends on BR2_PACKAGE_DIRECTFB

	depends on !BR2_PACKAGE_XSERVER_none

	depends on BR2_PACKAGE_XORG7



config BR2_PACKAGE_DIRECTFB_UNIQUE

	bool "enable unique window manager"

package/games/lxdoom/Config.in

+1 −1
Original line number Diff line number Diff line 
config BR2_PACKAGE_LXDOOM

	bool "lxdoom"

	depends on !BR2_PACKAGE_XSERVER_none

	depends on BR2_PACKAGE_XORG7

	help

	  This is the linux version of the popular doom game.