aboutsummaryrefslogtreecommitdiff
path: root/package/pango
diff options
context:
space:
mode:
authorGravatar Thomas Petazzoni <thomas.petazzoni@free-electrons.com>2009-07-17 15:42:40 +0200
committerGravatar Thomas Petazzoni <thomas.petazzoni@free-electrons.com>2009-07-24 23:26:47 +0200
commit6beeb755fa41a24ef54c189b8ae723534fa15c92 (patch)
tree7f6a13d143fb680a7a8b75f1f83e6a24c1118372 /package/pango
parentf2d8a44f263c24ff7858ed26e91f2505c8b66dd7 (diff)
downloadbuildroot-6beeb755fa41a24ef54c189b8ae723534fa15c92.tar.gz
buildroot-6beeb755fa41a24ef54c189b8ae723534fa15c92.tar.bz2
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: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'package/pango')
-rw-r--r--package/pango/pango.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/package/pango/pango.mk b/package/pango/pango.mk
index c1aac86bde..8cccae65f7 100644
--- a/package/pango/pango.mk
+++ b/package/pango/pango.mk
@@ -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 $@