# set GTK_BINARY_AGE and GTK_INTERFACE_AGE to 0.
m4_define([gtk_major_version], [3])
-m4_define([gtk_minor_version], [0])
-m4_define([gtk_micro_version], [1])
-m4_define([gtk_interface_age], [1])
+m4_define([gtk_minor_version], [1])
+m4_define([gtk_micro_version], [5])
+m4_define([gtk_interface_age], [0])
m4_define([gtk_binary_age],
[m4_eval(100 * gtk_minor_version + gtk_micro_version)])
m4_define([gtk_version],
m4_define([gtk_binary_version], [3.0.0])
# required versions of other packages
-m4_define([glib_required_version], [2.28.0])
-m4_define([pango_required_version], [1.20])
+m4_define([glib_required_version], [2.29.4])
+m4_define([pango_required_version], [1.24.0])
m4_define([atk_required_version], [1.30])
m4_define([cairo_required_version], [1.10.0])
m4_define([gdk_pixbuf_required_version], [2.22.0])
[AS_HELP_STRING([--enable-quartz-backend],
[enable the quartz gdk backend])],
[backend_set=yes])
+AC_ARG_ENABLE(broadway-backend,
+ [AS_HELP_STRING([--enable-broadway-backend],
+ [enable the broadway (HTML5) gdk backend])],
+ [backend_set=yes])
AC_ARG_ENABLE(wayland-backend,
- [AC_HELP_STRING([--enable-wayland-backend],
+ [AS_HELP_STRING([--enable-wayland-backend],
[enable the wayland gdk backend])],
[backend_set=yes])
GIO_PACKAGE=gio-2.0
PANGO_PACKAGES="pango pangocairo"
-if test "x$enable_x11_backend" == xyes; then
+if test "x$enable_x11_backend" = xyes; then
# GDK calls the xlib backend "x11," cairo calls it "xlib." Other
# backend names are identical.
cairo_backends="$cairo_backends cairo-xlib"
#define GDK_WINDOWING_X11"
fi
-if test "x$enable_win32_backend" == xyes; then
+if test "x$enable_win32_backend" = xyes; then
cairo_backends="$cairo_backends cairo-win32"
GDK_BACKENDS="$GDK_BACKENDS win32"
backend_immodules="$backend_immodules,ime"
AM_CONDITIONAL(USE_WIN32, false)
fi
-if test "x$enable_quartz_backend" == xyes; then
+if test "x$enable_quartz_backend" = xyes; then
cairo_backends="$cairo_backends cairo-quartz"
GDK_BACKENDS="$GDK_BACKENDS quartz"
GDK_WINDOWING="$GDK_WINDOWING
AM_CONDITIONAL(USE_QUARTZ, false)
fi
+
+if test "x$enable_broadway_backend" == xyes; then
+ GDK_BACKENDS="$GDK_BACKENDS broadway"
+ cairo_backends="$cairo_backends cairo"
+ GDK_WINDOWING="$GDK_WINDOWING
+#define GDK_WINDOWING_BROADWAY"
+ GDK_EXTRA_LIBS="$GDK_EXTRA_LIBS -lz"
+ AM_CONDITIONAL(USE_BROADWAY, true)
+else
+ AM_CONDITIONAL(USE_BROADWAY, false)
+fi
+
if test "x$enable_wayland_backend" == "xyes"; then
# Wayland uses cairo-gl
cairo_backends="$cairo_backends cairo-gl"
fi
# strip leading space
-GDK_BACKENDS=${GDK_BACKENDS/# }
+GDK_BACKENDS=${GDK_BACKENDS#* }
AC_SUBST(GDK_BACKENDS)
auto)
export SED
deplibs_check_method=`(./libtool --config; echo 'eval echo \"$deplibs_check_method\"') | sh`
- if test "x$deplibs_check_method" '!=' xpass_all || test "x$enable_static" = xyes ; then
+ if test "x$deplibs_check_method" != xpass_all || test "x$enable_static" = xyes ; then
enable_explicit_deps=yes
else
enable_explicit_deps=no
GTK_DEP_LIBS_FOR_X=
X_EXTENSIONS=
-if test "x$enable_x11_backend" == xyes; then
+if test "x$enable_x11_backend" = xyes; then
X_PACKAGES=fontconfig
#
fi
fi
+ # Check for XGetEventData for GenericEvents
+ AC_CHECK_FUNC(XGetEventData,
+ AC_DEFINE(HAVE_XGENERICEVENTS, 1, [Have XGenericEvent]))
+
# set up things for XInput
if test "x$enable_xinput" != "xno" && $PKG_CONFIG --exists "xi" ; then
have_xinput=yes
AM_CONDITIONAL(USE_X11, true)
# strip leading space
- X_EXTENSIONS=${X_EXTENSIONS/# }
+ X_EXTENSIONS=${X_EXTENSIONS#* }
else
XPACKAGES=
fi
GTK_PACKAGES="atk cairo cairo-gobject gdk-pixbuf-2.0 gio-2.0"
-if test "x$enable_x11_backend" == xyes; then
+if test "x$enable_x11_backend" = xyes; then
GTK_PACKAGES="$GTK_PACKAGES pangoft2"
fi
GTK_EXTRA_LIBS=
AM_CONDITIONAL(ENABLE_PACKAGEKIT, test "x$build_packagekit" = "xyes")
+##################################################
+# colord module
+#################################################
+
+AC_ARG_ENABLE(colord,
+ [AS_HELP_STRING([--disable-colord],
+ [build colord support code])])
+
+have_colord=no
+if test "x$enable_colord" != "xno"; then
+ if test "os_win32" != "yes"; then
+ PKG_CHECK_MODULES(COLORD, colord >= 0.1.9)
+ have_colord=yes
+ AC_DEFINE(HAVE_COLORD, 1, [define if we have colord])
+ else
+ AC_MSG_ERROR([colord support is not available on win32])
+ fi
+fi
+
+AM_CONDITIONAL(HAVE_COLORD, test "x$have_colord" = "xyes")
+
##################################################
# Checks for gtk-doc and docbook-tools
##################################################
-GTK_DOC_CHECK([1.11])
+GTK_DOC_CHECK([1.11],[--flavour no-tmpl])
AC_CHECK_PROG(DB2HTML, db2html, true, false)
AM_CONDITIONAL(HAVE_DOCBOOK, $DB2HTML)
demos/Makefile
demos/gtk-demo/Makefile
demos/gtk-demo/geninclude.pl
+demos/pixbuf-demo/Makefile
examples/Makefile
tests/Makefile
+tests/css/Makefile
+tests/css/parser/Makefile
+tests/reftests/Makefile
docs/Makefile
docs/reference/Makefile
docs/reference/gdk/Makefile
build/Makefile
build/win32/Makefile
build/win32/vs9/Makefile
+build/win32/vs10/Makefile
gdk/Makefile
+gdk/broadway/Makefile
gdk/x11/Makefile
gdk/win32/Makefile
gdk/win32/rc/Makefile
AC_OUTPUT
# beautify the immodule list a bit
-included_immodules=${included_immodules//,/ }
-included_immodules=${included_immodules:-none}
+included_immodules=$(echo "${included_immodules}" | $SED 's/,/ /g')
+if test -z "${included_immodules}"; then included_immodules="none"; fi
echo ""
echo " GTK+ $GTK_VERSION"
echo " Dynamic modules: $build_dynamic_modules"
echo " Included immodules: $included_immodules"
echo " PackageKit support: $build_packagekit"
+echo " colord support: $have_colord"
echo " Introspection: $found_introspection"
echo " Debugging: $enable_debug"
echo " Documentation: $enable_gtk_doc"
projects / ~andy / gtk / blobdiff