# - 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], [7])
+m4_define([clutter_minor_version], [11])
+m4_define([clutter_micro_version], [1])
# • 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
platform_win32=yes
],
+ [*-*-linux*],
+ [
+ platform_linux=yes
+ ],
+
[]
)
AC_MSG_RESULT([$platform_win32])
AC_CHECK_HEADER([GL/glx.h], [platform_glx=yes], [platform_glx=no])
AC_CHECK_LIB([GL], [glXCreateContext], [platform_glx=yes], [platform_glx=no])
AM_CONDITIONAL(OS_GLX, [test "$platform_glx" = "yes"])
+AM_CONDITIONAL(OS_LINUX, [test "$platform_linux" = "yes"])
AC_SUBST(CLUTTER_LT_LDFLAGS)
AC_HEADER_STDC
# required versions for dependencies
-m4_define([glib_req_version], [2.31.0])
-m4_define([cogl_req_version], [1.9.4])
+m4_define([glib_req_version], [2.31.19])
+m4_define([cogl_req_version], [1.9.6])
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])
m4_define([xfixes_req_version], [3])
m4_define([xcomposite_req_version], [0.4])
-m4_define([gdk_req_version], [3.0.0])
+m4_define([gdk_req_version], [3.3.18])
AC_SUBST([GLIB_REQ_VERSION], [glib_req_version])
AC_SUBST([COGL_REQ_VERSION], [cogl_req_version])
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"
],
[])
[enable_tslib=$enableval],
[enable_tslib=no])
AC_ARG_ENABLE([evdev-input],
- [AS_HELP_STRING([--with-evdev=@<:@yes/no@:>@], [Enable evdev for input events (default=no)])],
+ [AS_HELP_STRING([--enable-evdev-input=@<:@yes/no@:>@], [Enable evdev for input events (default=no)])],
[enable_evdev=$enableval],
[enable_evdev=no])
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"])
+
dnl Instead of using AM_CFLAGS to ensure
dnl COGL_ENABLE_EXPERIMENTAL_2_0_API is defined while compiling clutter
dnl and cogl code we use a define in config.h instead. This helps ensure
[Define to 1 if XInput is available])
])
+ clutter_save_LIBS="$LIBS"
+ LIBS="$LIBS -lXi"
+
+ AC_CHECK_FUNC([XIAllowTouchEvents],
+ [
+ AC_CHECK_MEMBER([XIScrollClassInfo.number],
+ [
+ have_xinput_2_2=yes
+ 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>]])])
+
+ LIBS="$clutter_save_LIBS"
+
X11_LIBS="$X11_LIBS $XINPUT_LIBS"
X11_PC_FILES="$X11_PC_FILES xi"
- X11_EXTS="$X11_EXTS xi"
+
+ AS_IF([test "x$have_xinput_2_2" = "xyes"],
+ [X11_EXTS="$X11_EXTS xi2.2"],
+ [X11_EXTS="$X11_EXTS xi2.0"])
],
[no],
AC_CACHE_SAVE
+dnl === Enable GDK-Pixbuf in tests ============================================
+
+m4_define([pixbuf_default], [yes])
+AC_ARG_ENABLE([gdk-pixbuf],
+ [AS_HELP_STRING([--enable-gdk-pixbuf=@<:@no/yes@:>@],
+ [Enable tests using GDK-Pixbuf @<:@default=]pixbuf_default[@:>@])],
+ [enable_pixbuf=$enable_val],
+ [enable_pixbuf=pixbuf_default])
+
+AS_CASE([$enable_pixbuf],
+
+ [yes],
+ [
+ PKG_CHECK_MODULES([GDK_PIXBUF], [gdk-pixbuf-2.0])
+ AC_SUBST(GDK_PIXBUF_CFLAGS)
+ AC_SUBST(GDK_PIXBUF_LIBS)
+ pixbuf_tests=yes
+ ],
+
+ [no],
+ [
+ pixbuf_tests=no
+ ]
+)
+
+AM_CONDITIONAL([PIXBUF_TESTS], [test "x$pixbuf_tests" = "xyes"])
+
dnl === Enable debug level ====================================================
m4_define([debug_default], [m4_if(m4_eval(clutter_minor_version % 2), [1], [yes], [minimum])])
[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])]
MAINTAINER_COMPILER_FLAGS="$MAINTAINER_COMPILER_FLAGS
-Wall -Wcast-align -Wuninitialized
-Wno-strict-aliasing -Wempty-body -Wformat
- -Wformat-security -Winit-self
+ -Wformat-security -Wformat-nonliteral -Winit-self
-Wdeclaration-after-statement -Wvla
- -Wpointer-arith"
+ -Wpointer-arith -Wmissing-declarations
+ -Wcast-align
+ -Wredundant-decls"
AS_CASE([$enable_maintainer_flags],
[yes],
clutter/Makefile
clutter/clutter-config.h
clutter/clutter-version.h
- clutter/clutter-version.h.win32
clutter/clutter-$CLUTTER_API_VERSION.pc:clutter/clutter.pc.in
clutter/cally/cally-$CLUTTER_API_VERSION.pc:clutter/cally/cally.pc.in
echo " Build introspection data: ${enable_introspection}"
echo " Build conformance test suite: ${enable_conformance}"
echo " Build X11-specific tests: ${x11_tests}"
+echo " Build tests using GDK-Pixbuf: ${pixbuf_tests}"
# Clutter backend related flags
echo ""
echo ""
echo " - X11 backend options:"
echo " Enabled extensions: ${X11_EXTS}"
-echo " Build X11-specific tests: ${x11_tests}"
fi
if test "x$SUPPORT_CEX100" = "x1"; then