aboutsummaryrefslogtreecommitdiff
path: root/package/cairo
diff options
context:
space:
mode:
authorGravatar Thomas Lundquist <lists@zelow.no>2009-01-12 15:22:41 +0000
committerGravatar Thomas Lundquist <lists@zelow.no>2009-01-12 15:22:41 +0000
commit8356803dcf83a49d8d5f7e4b985b77d50c6b67e4 (patch)
treebbe5dec1bd30c920233cf32c4606e84e5a85a4a0 /package/cairo
parent6e4c616df807d35b185f772484f1e831768deeef (diff)
downloadbuildroot-8356803dcf83a49d8d5f7e4b985b77d50c6b67e4.tar.gz
buildroot-8356803dcf83a49d8d5f7e4b985b77d50c6b67e4.tar.bz2
Fix dependencies.
Diffstat (limited to 'package/cairo')
-rw-r--r--package/cairo/Config.in1
-rw-r--r--package/cairo/cairo.mk8
2 files changed, 4 insertions, 5 deletions
diff --git a/package/cairo/Config.in b/package/cairo/Config.in
index 5247204e27..2c924cf706 100644
--- a/package/cairo/Config.in
+++ b/package/cairo/Config.in
@@ -3,6 +3,7 @@ config BR2_PACKAGE_CAIRO
select BR2_PACKAGE_PKGCONFIG
select BR2_PACKAGE_LIBPNG
select BR2_PACKAGE_ZLIB
+ select BR2_PACKAGE_PIXMAN
select BR2_PACKAGE_FONTCONFIG
depends on BR2_PACKAGE_XORG||BR2_PACKAGE_XORG7||BR2_PACKAGE_TINYX||BR2_PACKAGE_DIRECTFB
help
diff --git a/package/cairo/cairo.mk b/package/cairo/cairo.mk
index f574e42afd..396b8ebcdc 100644
--- a/package/cairo/cairo.mk
+++ b/package/cairo/cairo.mk
@@ -41,15 +41,13 @@ CAIRO_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_GLIB_GENMARSHAL=$(HOST_GLIB)/bin/glib-genmarshal
-CAIRO_CONF_OPT = --disable-gtk-doc --with-html-dir=/dev/null
ifeq ($(BR2_PACKAGE_DIRECTFB),y)
- CAIRO_CONF_OPT = --disable-xlib --without-x --enable-directfb \
- --disable-gtk-doc --with-html-dir=/dev/null
+ CAIRO_CONF_OPT = --disable-xlib --without-x --enable-directfb
CAIRO_DEPENDENCIES_EXTRA = directfb
endif
+CAIRO_CONF_OPT += --disable-gtk-doc --with-html-dir=/dev/null
-
-CAIRO_DEPENDENCIES = uclibc gettext libintl pkgconfig libglib2 zlib libpng fontconfig $(CAIRO_DEPENDENCIES_EXTRA) pixman $(XSERVER)
+CAIRO_DEPENDENCIES = uclibc gettext libintl pkgconfig zlib libpng fontconfig $(CAIRO_DEPENDENCIES_EXTRA) pixman $(XSERVER)
$(eval $(call AUTOTARGETS,package,cairo))