On Mon, May 23, 2016 at 11:43:29AM +0300, Pekka Paalanen wrote: > From: Pekka Paalanen <pekka.paala...@collabora.co.uk> > > This introduces a variable common for both wayland-client and > wayland-server required version number. As most developers usually build > everything, testing server and client version requirements separately is > more poorly tested than version requirements in general. The server > requirement being greater than the client requirement will mask any > issues from forgetting to bump the client requirement appropriately. > Therefore the requirements are unified. > > This bumps wayland-client requirement to 1.10.0, on par with the > existing wayland-server requirement. > > Only the checks which explicitly defined a version are updated, > unversioned checks are left as is. > > The variable style follows that of Mesa. > > This patch is based on the similar patch by Bryce Harrington that used > m4_define instead of a variable.
Since that's such a minor change, I'll just squash this to mine. Bryce > Cc: Bryce Harrington <br...@osg.samsung.com> > Cc: Quentin Glidic <sardemff7+wayl...@sardemff7.net> > Signed-off-by: Pekka Paalanen <pekka.paala...@collabora.co.uk> > --- > configure.ac | 13 ++++++++----- > 1 file changed, 8 insertions(+), 5 deletions(-) > > diff --git a/configure.ac b/configure.ac > index e1300b4..e4516c1 100644 > --- a/configure.ac > +++ b/configure.ac > @@ -11,6 +11,9 @@ AC_INIT([weston], > [weston], > [http://wayland.freedesktop.org]) > > +# External dependency versions > +WAYLAND_REQUIRED="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 +63,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_REQUIRED pixman-1 >= 0.25.2" > > AC_CONFIG_FILES([doc/doxygen/tools.doxygen doc/doxygen/tooldev.doxygen]) > > @@ -193,7 +196,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_REQUIRED > wayland-egl wayland-cursor]) > fi > > > @@ -335,7 +338,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_REQUIRED]) > > AC_ARG_ENABLE(simple-clients, > AS_HELP_STRING([--disable-simple-clients], > @@ -389,9 +392,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_REQUIRED 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_REQUIRED]) > > # 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"], [ > -- > 2.7.3 _______________________________________________ wayland-devel mailing list wayland-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/wayland-devel