diff options
author | Emmanuele Bassi <ebassi@gnome.org> | 2014-01-14 13:01:35 +0000 |
---|---|---|
committer | Emmanuele Bassi <ebassi@gnome.org> | 2016-10-18 11:29:34 +0100 |
commit | d519e4aafe325106f6a5f2139921bf246cb4848d (patch) | |
tree | 97c6deaa94cec34f0da79a74a7bc157a068dc09b /configure.ac | |
parent | 3fb413beead9e3e5ca5e4f6b92e0ff15242783ac (diff) | |
download | gtk+-d519e4aafe325106f6a5f2139921bf246cb4848d.tar.gz |
gsk: Initial commit / build environment
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 26 |
1 files changed, 25 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index b915438d2c..e9bfd98cdf 100644 --- a/configure.ac +++ b/configure.ac @@ -64,6 +64,7 @@ m4_define([wayland_protocols_required_version], [1.7]) m4_define([mirclient_required_version], [0.22.0]) m4_define([mircookie_required_version], [0.17.0]) m4_define([epoxy_required_version], [1.0]) +m4_define([graphene_required_version], [1.2]) GLIB_REQUIRED_VERSION=glib_required_version PANGO_REQUIRED_VERSION=pango_required_version ATK_REQUIRED_VERSION=atk_required_version @@ -1365,6 +1366,26 @@ AC_SUBST(GDK_EXTRA_CFLAGS) AC_SUBST(GDK_DEP_LIBS) AC_SUBST(GDK_DEP_CFLAGS) +######################################## +# Check for GSK flags +######################################## + +GSK_EXTRA_LIBS= +GSK_EXTRA_CFLAGS= + +GSK_PACKAGES="gdk-pixbuf-2.0 >= gdk_pixbuf_required_version cairo >= cairo_required_version cairo-gobject >= cairo_required_version graphene-1.0 >= graphene_required_version" +GSK_PRIVATE_PACKAGES="epoxy >= epoxy_required_version" + +PKG_CHECK_MODULES(GSK_DEP, $PANGO_PACKAGES $GSK_PACKAGES $GSK_PRIVATE_PACKAGES) +GSK_DEP_LIBS="$GSK_EXTRA_LIBS $GSK_DEP_LIBS $MATH_LIB" +GSK_DEP_CFLAGS="$GSK_DEP_CFLAGS $GSK_EXTRA_CFLAGS" + +AC_SUBST(GSK_PACKAGES) +AC_SUBST(GSK_PRIVATE_PACKAGES) +AC_SUBST(GSK_EXTRA_LIBS) +AC_SUBST(GSK_EXTRA_CFLAGS) +AC_SUBST(GSK_DEP_LIBS) +AC_SUBST(GSK_DEP_CFLAGS) ######################################## # Check for Accessibility Toolkit flags @@ -1379,7 +1400,7 @@ fi PKG_CHECK_MODULES(ATK, $ATK_PACKAGES) GTK_PACKAGES="atk >= atk_required_version cairo >= cairo_required_version cairo-gobject >= cairo_required_version gdk-pixbuf-2.0 >= gdk_pixbuf_required_version gio-2.0 >= glib_required_version" -GTK_PRIVATE_PACKAGES="$ATK_PACKAGES $WAYLAND_PACKAGES $MIR_PACKAGES epoxy >= epoxy_required_version" +GTK_PRIVATE_PACKAGES="$ATK_PACKAGES $WAYLAND_PACKAGES $MIR_PACKAGES epoxy >= epoxy_required_version graphene-1.0 >= graphene_required_version" if test "x$enable_x11_backend" = xyes -o "x$enable_wayland_backend" = xyes; then GTK_PRIVATE_PACKAGES="$GTK_PRIVATE_PACKAGES pangoft2" fi @@ -1923,6 +1944,7 @@ config.h.win32 gtk-zip.sh Makefile gdk-4.0.pc +gsk-4.0.pc gtk+-4.0.pc gtk+-unix-print-4.0.pc gail-4.0.pc @@ -1955,6 +1977,7 @@ testsuite/css/parser/Makefile testsuite/css/nodes/Makefile testsuite/css/style/Makefile testsuite/gdk/Makefile +testsuite/gsk/Makefile testsuite/gtk/Makefile testsuite/reftests/Makefile testsuite/tools/Makefile @@ -1985,6 +2008,7 @@ gdk/quartz/Makefile gdk/wayland/Makefile gdk/mir/Makefile gdk/gdkversionmacros.h +gsk/Makefile gtk/Makefile gtk/makefile.msc gtk/gtkversion.h |