NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

xorg: use BR2_PACKAGE_XORG instead of BR2_PACKAGE_XSERVER_none

Browse Source 
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: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
Thomas Petazzoni 2009-07-17 15:42:40 +02:00
parent f2d8a44f26
commit 6beeb755fa
10 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package/atk/atk.mk
View File

@ -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

2
package/cairo/cairo.mk
View File

@ -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

2
package/cups/cups.mk
View File

@ -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

2
package/directfb/Config.in
View File

@ -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"

2
package/games/lxdoom/Config.in
View File

@ -1,5 +1,5 @@
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.

2
package/java/classpath/classpath.mk
View File

@ -77,7 +77,7 @@ else
CLASSPATH_CONF_OPT+= --disable-gtk-peer
endif
ifneq ($(BR2_PACKAGE_XSERVER_none),y)
ifeq ($(BR2_PACKAGE_XORG7),y)
CLASSPATH_DEPENDENCIES+= $(XSERVER)
CLASSPATH_CONF_OPT+= --with-x \
--x-includes=$(STAGING_DIR)/usr/include/X11 \

2
package/java/jamvm/jamvm.mk
View File

@ -52,7 +52,7 @@ JAMVM_CONF_OPT = \
JAMVM_DEPENDENCIES = uclibc host-pkgconfig classpath
#Include X libraries when we have an X server
ifneq ($(BR2_PACKAGE_XSERVER_none),y)
ifeq ($(BR2_PACKAGE_XORG7),y)
JAMVM_DEPENDENCIES+= $(XSERVER)
JAMVM_CONF_OPT+= --with-x \
--x-includes=$(STAGING_DIR)/usr/include/X11 \

2
package/libgtk2/libgtk2.mk
View File

@ -85,7 +85,7 @@ ifeq ($(BR2_PACKAGE_DIRECTFB),y)
LIBGTK2_DEPENDENCIES += directfb
endif
ifneq ($(BR2_PACKAGE_XSERVER_none),y)
ifeq ($(BR2_PACKAGE_XORG7),y)
LIBGTK2_CONF_OPT += \
--with-x \
--x-includes=$(STAGING_DIR)/usr/include/X11 \

4
package/pango/pango.mk
View File

@ -40,7 +40,7 @@ PANGO_CONF_ENV = ac_cv_func_posix_getpwuid_r=yes glib_cv_stack_grows=no \
ac_use_included_regex=no gl_cv_c_restrict=no \
ac_cv_path_FREETYPE_CONFIG=$(STAGING_DIR)/usr/bin/freetype-config
ifneq ($(BR2_PACKAGE_XSERVER_none),y)
ifeq ($(BR2_PACKAGE_XORG7),y)
PANGO_CONF_OPT_X = --with-x \
--x-includes=$(STAGING_DIR)/usr/include/X11 \
--x-libraries=$(STAGING_DIR)/usr/lib --disable-glibtest
@ -85,7 +85,7 @@ $(STAMP_DIR)/host_pango_configured: $(STAMP_DIR)/host_pango_unpacked $(STAMP_DIR
--prefix="$(HOST_DIR)/usr" \
--sysconfdir="$(HOST_DIR)/etc" \
--disable-static \
$(if $(BR2_PACKAGE_XSERVER_none),--without-x,--with-x) \
$(if $(BR2_PACKAGE_XORG7),--with-x,--without-x) \
--disable-debug \
)
touch $@

2
package/xpdf/xpdf.mk
View File

@ -17,7 +17,7 @@ ifeq ($(BR2_SOFT_FLOAT),y)
XPDF_CONF_OPT += --enable-fixedpoint
endif
ifneq ($(BR2_PACKAGE_XSERVER_none),y)
ifeq ($(BR2_PACKAGE_XORG7),y)
XPDF_DEPENDENCIES += $(XSERVER) openmotif
XPDF_CONF_OPT += --with-Xm-library=$(STAGING_DIR)/usr/lib --with-Xm-includes=$(STAGING_DIR)/usr/include/Xm \
--with-x --with-freetype2-includes=$(STAGING_DIR)/usr/include \