diff options
| author | Bryce Harrington <bryce@osg.samsung.com> | 2016-05-11 13:18:59 -0700 |
|---|---|---|
| committer | Bryce Harrington <bryce@osg.samsung.com> | 2016-05-24 11:08:21 -0700 |
| commit | 46f1f0516cfdd9e0bb99aa7e0545f6ef1dc64bd6 (patch) | |
| tree | 43a771efb4fbf064ff01dcb1581870f64055c94a | |
| parent | 28834b6472d763fae005a35d6e7a6c756ccced05 (diff) | |
| download | weston-46f1f0516cfdd9e0bb99aa7e0545f6ef1dc64bd6.tar.gz | |
build: Define wayland prereq version
Establishes a single variable for defining the libwayland version
requirements, where we have versioned checks. Enforces the same version
dependency between libwayland-client and libwayland-server. Developers
typically only test the greater version of the two, so if they're
different it masks cases that don't get tested adequately. So this sets
wayland-client's required version to 1.10, same as for the server.
Signed-off-by: Bryce Harrington <bryce@osg.samsung.com>
Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
Reviewed-by: Quentin Glidic <sardemff7+git@sardemff7.net>
Tested-by: Quentin Glidic <sardemff7+git@sardemff7.net>
| -rw-r--r-- | configure.ac | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index e1300b45..d0349079 100644 --- a/configure.ac +++ b/configure.ac @@ -11,6 +11,8 @@ AC_INIT([weston], [weston], [http://wayland.freedesktop.org]) +WAYLAND_PREREQ_VERSION="1.10.0" + AC_SUBST([WESTON_VERSION_MAJOR], [weston_major_version]) AC_SUBST([WESTON_VERSION_MINOR], [weston_minor_version]) AC_SUBST([WESTON_VERSION_MICRO], [weston_micro_version]) @@ -60,7 +62,7 @@ AC_CHECK_HEADERS([execinfo.h]) AC_CHECK_FUNCS([mkostemp strchrnul initgroups posix_fallocate]) -COMPOSITOR_MODULES="wayland-server >= 1.10.0 pixman-1 >= 0.25.2" +COMPOSITOR_MODULES="wayland-server >= $WAYLAND_PREREQ_VERSION pixman-1 >= 0.25.2" AC_CONFIG_FILES([doc/doxygen/tools.doxygen doc/doxygen/tooldev.doxygen]) @@ -193,7 +195,7 @@ AM_CONDITIONAL(ENABLE_WAYLAND_COMPOSITOR, if test x$enable_wayland_compositor = xyes -a x$enable_egl = xyes; then AC_DEFINE([BUILD_WAYLAND_COMPOSITOR], [1], [Build the Wayland (nested) compositor]) - PKG_CHECK_MODULES(WAYLAND_COMPOSITOR, [wayland-client >= 1.5.91 wayland-egl wayland-cursor]) + PKG_CHECK_MODULES(WAYLAND_COMPOSITOR, [wayland-client >= $WAYLAND_PREREQ_VERSION wayland-egl wayland-cursor]) fi @@ -335,7 +337,7 @@ AM_CONDITIONAL(ENABLE_VAAPI_RECORDER, test "x$have_libva" = xyes) PKG_CHECK_MODULES(CAIRO, [cairo]) -PKG_CHECK_MODULES(TEST_CLIENT, [wayland-client >= 1.10.0]) +PKG_CHECK_MODULES(TEST_CLIENT, [wayland-client >= $WAYLAND_PREREQ_VERSION]) AC_ARG_ENABLE(simple-clients, AS_HELP_STRING([--disable-simple-clients], @@ -389,9 +391,9 @@ AM_CONDITIONAL(BUILD_CLIENTS, test x$enable_clients = xyes) if test x$enable_clients = xyes; then AC_DEFINE([BUILD_CLIENTS], [1], [Build the Wayland clients]) - PKG_CHECK_MODULES(CLIENT, [wayland-client >= 1.5.91 cairo >= 1.10.0 xkbcommon wayland-cursor]) + PKG_CHECK_MODULES(CLIENT, [wayland-client >= $WAYLAND_PREREQ_VERSION cairo >= 1.10.0 xkbcommon wayland-cursor]) PKG_CHECK_MODULES(SERVER, [wayland-server]) - PKG_CHECK_MODULES(WESTON_INFO, [wayland-client >= 1.5.91]) + PKG_CHECK_MODULES(WESTON_INFO, [wayland-client >= $WAYLAND_PREREQ_VERSION]) # Only check for cairo-egl if a GL or GLES renderer requested AS_IF([test "x$cairo_modules" = "xcairo-gl" -o "x$cairo_modules" = "xcairo-glesv2"], [ |