diff options
Diffstat (limited to 'package/pango')
| -rw-r--r-- | package/pango/pango.mk | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/package/pango/pango.mk b/package/pango/pango.mk index c1aac86bd..2bcebf3b7 100644 --- a/package/pango/pango.mk +++ b/package/pango/pango.mk @@ -40,20 +40,20 @@ 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) - PANGO_CONF_OPT_X = --with-x \ +PANGO_CONF_OPT = --enable-shared --enable-static \ + --enable-explicit-deps=no --disable-debug + +PANGO_DEPENDENCIES = uclibc gettext libintl host-pkgconfig libglib2 cairo + +ifeq ($(BR2_PACKAGE_XORG7),y) + PANGO_CONF_OPT += --with-x \ --x-includes=$(STAGING_DIR)/usr/include/X11 \ --x-libraries=$(STAGING_DIR)/usr/lib --disable-glibtest + PANGO_DEPENDENCIES += xserver_xorg-server else - PANGO_CONF_OPT_X = --without-x + PANGO_CONF_OPT += --without-x endif -PANGO_CONF_OPT = --enable-shared --enable-static \ - $(PANGO_CONF_OPT_X) \ - --enable-explicit-deps=no --disable-debug - -PANGO_DEPENDENCIES = uclibc gettext libintl host-pkgconfig libglib2 $(XSERVER) cairo - $(eval $(call AUTOTARGETS,package,pango)) $(PANGO_HOOK_POST_INSTALL): @@ -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 $@ |