diff options
| author | Peter Korsgaard <jacmet@sunsite.dk> | 2012-09-03 21:33:25 +0200 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2012-09-03 21:59:03 +0200 |
| commit | 32a0454d3c495b12824ef4a0d0341237302d148a (patch) | |
| tree | 9acc870d089b0028cecdfb1846b828ae4bd38910 /package/cairo | |
| parent | f9686563b4fd3eed22e26105f7c440f0b74fcac1 (diff) | |
| parent | dafa32b3bd75e9d155d075c796fa5b0ecbb9b11b (diff) | |
| download | buildroot-novena-32a0454d3c495b12824ef4a0d0341237302d148a.tar.gz buildroot-novena-32a0454d3c495b12824ef4a0d0341237302d148a.zip | |
Merge branch 'next'
Conflicts:
package/e2fsprogs/e2fsprogs.mk
package/libfuse/libfuse.mk
package/multimedia/mpd/mpd.mk
package/smartmontools/smartmontools.mk
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Diffstat (limited to 'package/cairo')
| -rw-r--r-- | package/cairo/Config.in | 3 | ||||
| -rw-r--r-- | package/cairo/cairo.mk | 6 |
2 files changed, 9 insertions, 0 deletions
diff --git a/package/cairo/Config.in b/package/cairo/Config.in index 19c47231d..398e47fb6 100644 --- a/package/cairo/Config.in +++ b/package/cairo/Config.in @@ -32,4 +32,7 @@ config BR2_PACKAGE_CAIRO_SVG select BR2_PACKAGE_CAIRO_PNG select BR2_PACKAGE_CAIRO_PDF +config BR2_PACKAGE_CAIRO_TEE + bool "tee support" endif + diff --git a/package/cairo/cairo.mk b/package/cairo/cairo.mk index 6b456dd89..eedb28d0e 100644 --- a/package/cairo/cairo.mk +++ b/package/cairo/cairo.mk @@ -77,4 +77,10 @@ else CAIRO_CONF_OPT += --disable-svg endif +ifeq ($(BR2_PACKAGE_CAIRO_TEE),y) + CAIRO_CONF_OPT += --enable-tee +else + CAIRO_CONF_OPT += --disable-tee +endif + $(eval $(autotools-package)) |