# - increase clutter_micro_version to the next odd number
# - increase clutter_interface_version to the next odd number
m4_define([clutter_major_version], [1])
-m4_define([clutter_minor_version], [9])
-m4_define([clutter_micro_version], [16])
+m4_define([clutter_minor_version], [11])
+m4_define([clutter_micro_version], [5])
# • for stable releases: increase the interface age by 1 for each release;
# if the API changes, set to 0. interface_age and binary_age are used to
m4_define([json_glib_req_version], [0.12.0])
m4_define([atk_req_version], [2.1.5])
m4_define([cairo_req_version], [1.10])
-m4_define([pango_req_version], [1.20])
+m4_define([pango_req_version], [1.30])
m4_define([gi_req_version], [0.9.5])
m4_define([uprof_req_version], [0.3])
m4_define([gtk_doc_req_version], [1.15])
PKG_CHECK_EXISTS([wayland-client xkbcommon gdk-pixbuf-2.0],
[
- BACKEND_PC_FILES="$BACKEND_PC_FILES wayland-client xkbcommon",
+ BACKEND_PC_FILES="$BACKEND_PC_FILES wayland-client xkbcommon"
BACKEND_PC_FILES_PRIVATE="$BACKEND_PC_FILES_PRIVATE gdk-pixbuf-2.0"
],
[])
AC_MSG_ERROR([No backend enabled. You need to enable at least one backend.])
])
+AS_IF([test "x$platform_linux" = "xyes"],
+ [
+ AC_DEFINE([OS_LINUX], [1], [Define to 1 if building for Linux])
+ ])
+
# additional input backends
AC_ARG_ENABLE([tslib-input],
AM_CONDITIONAL(USE_EVDEV, [test "x$have_evdev" = "xyes"])
AM_CONDITIONAL(USE_GLD, [test "x$have_gdl" = "xyes"])
-AM_CONDITIONAL(NEED_XKB_UTILS, [test "x$have_evdev" = "xyes" -O "x$SUPPORT_WAYLAND" = "x1"])
+AM_CONDITIONAL(NEED_XKB_UTILS, [test "x$have_evdev" = "xyes" -o "x$SUPPORT_WAYLAND" = "x1"])
dnl Instead of using AM_CFLAGS to ensure
dnl COGL_ENABLE_EXPERIMENTAL_2_0_API is defined while compiling clutter
AC_CHECK_MEMBER([XIScrollClassInfo.number],
[
have_xinput_2_2=yes
- AC_DEFINE([XINPUT_2_2], [1], [Define to 1 if XInput 2.2 is available])
+ AC_DEFINE([HAVE_XINPUT_2_2], [1], [Define to 1 if XInput 2.2 is available])
],
[have_xinput_2_2=no],
[[#include <X11/extensions/XInput2.h>]])])
[yes],
[
- CLUTTER_DEPRECATED_CFLAGS="-DGLIB_DISABLE_DEPRECATION_WARNINGS -DCLUTTER_DISABLE_DEPRECATION_WARNINGS"
+ CLUTTER_DEPRECATED_CFLAGS="-DGLIB_DISABLE_DEPRECATION_WARNINGS"
],
[AC_MSG_ERROR([Unknown argument for --enable-deprecated])]
AC_SUBST([CLUTTER_DEPRECATED_CFLAGS])
-dnl === Conformance test suite ================================================
-
-AC_ARG_ENABLE([conformance],
- [AS_HELP_STRING([--enable-conformance=@<:@no/yes@:>@],
- [Build conformance test suite @<:@default=yes@:>@])],
- [],
- [enable_conformance=yes])
-
-AM_CONDITIONAL([BUILD_TESTS], [test "x$enable_conformance" = "xyes"])
-
dnl === Profiling =============================================================
m4_define([profile_default], [no])
-Wformat-security -Wformat-nonliteral -Winit-self
-Wdeclaration-after-statement -Wvla
-Wpointer-arith -Wmissing-declarations
- -Waggregate-returns -Wcast-align
+ -Wcast-align
-Wredundant-decls"
AS_CASE([$enable_maintainer_flags],
[The prefix for our gettext translation domains.])
AS_ALL_LINGUAS
+dnl = Build optionals =========================================================
+
+dnl === Conformance test suite ================================================
+
+AC_ARG_ENABLE([conformance],
+ [AS_HELP_STRING([--disable-conformance], [Whether the conformance tests should be built])],
+ [],
+ [enable_conformance=yes])
+
+AC_ARG_ENABLE([tests],
+ [AS_HELP_STRING([--disable-tests], [Whether tests should be built])],
+ [],
+ [enable_tests=yes])
+AM_CONDITIONAL(BUILD_TESTS, [test "x$enable_tests" = "xyes" && test "x$enable_conformance" = "xyes"])
+
+AC_ARG_ENABLE([examples],
+ [AS_HELP_STRING([--disable-examples], [Whether examples should be built])],
+ [],
+ [enable_examples=yes])
+AM_CONDITIONAL(BUILD_EXAMPLES, [test "x$enable_examples" = "xyes"])
+
dnl ===========================================================================
AC_CONFIG_FILES([
tests/micro-bench/Makefile
tests/performance/Makefile
+ examples/Makefile
+
doc/Makefile
doc/reference/Makefile
doc/reference/clutter/Makefile
echo ""
echo " • Extra:"
echo " Build introspection data: ${enable_introspection}"
-echo " Build conformance test suite: ${enable_conformance}"
+echo " Build test suites: ${enable_tests}"
+if test "x$enable_tests" = "xyes"; then
echo " Build X11-specific tests: ${x11_tests}"
echo " Build tests using GDK-Pixbuf: ${pixbuf_tests}"
+fi
+echo " Build examples: ${enable_examples}"
# Clutter backend related flags
echo ""