diff options
| author | Javier Jardón <jjardon@gnome.org> | 2014-10-25 20:23:16 +0100 |
|---|---|---|
| committer | Javier Jardón <jjardon@gnome.org> | 2014-11-10 15:12:17 +0000 |
| commit | 710f3320827b437bbcf4292203439a16e5117813 (patch) | |
| tree | 4985598b1d694f03776bf2fbc1503d2f01e8e9f5 /configure.ac | |
| parent | 36fedb0c4b373272afc2d76a7c790d696ed48034 (diff) | |
| download | gtk+-710f3320827b437bbcf4292203439a16e5117813.tar.gz | |
configure.ac: Depend on cairo 1.14.0
This is needed for cairo_set_device_scale()
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/configure.ac b/configure.ac index 7c78d52ad7..d8105127d7 100644 --- a/configure.ac +++ b/configure.ac @@ -44,7 +44,7 @@ m4_define([gtk_binary_version], [3.0.0]) m4_define([glib_required_version], [2.43.0]) m4_define([pango_required_version], [1.36.7]) m4_define([atk_required_version], [2.15.1]) -m4_define([cairo_required_version], [1.12.0]) +m4_define([cairo_required_version], [1.14.0]) m4_define([gdk_pixbuf_required_version], [2.30.0]) m4_define([introspection_required_version], [1.39.0]) m4_define([wayland_required_version], [1.5.91]) @@ -1342,17 +1342,6 @@ else LIBS="$gtk_save_LIBS" fi -# Check for cairo_set_device_scale, as we don't want to depend hard on -# this until there is a stable release with it -CAIRO_CFLAGS=`$PKG_CONFIG --cflags cairo` -CAIRO_LIBS=`$PKG_CONFIG --libs cairo` -CFLAGS="$CFLAGS $CAIRO_CFLAGS" -gtk_save_LIBS="$LIBS" -LIBS="$CAIRO_LIBS $LIBS" -AC_CHECK_FUNCS(cairo_surface_set_device_scale) -LIBS="$gtk_save_LIBS" - - CFLAGS="$saved_cflags" LDFLAGS="$saved_ldflags" |