On Thu, 12 May 2016 11:12:28 +1000 Peter Hutterer <[email protected]> wrote:
> On Wed, May 11, 2016 at 01:18:59PM -0700, Bryce Harrington wrote: > > Establishes a single variable for defining the libwayland version > > requirements. Enforces the same version dependency between > > libwayland-client and libwayland-server, as recommended by pq in the > > 1.11 release discussions. > > > > Signed-off-by: Bryce Harrington <[email protected]> > > --- > > configure.ac | 12 +++++++----- > > 1 file changed, 7 insertions(+), 5 deletions(-) > > > > diff --git a/configure.ac b/configure.ac > > index 2ca1f4e..0b23fc4 100644 > > --- a/configure.ac > > +++ b/configure.ac > > @@ -4,6 +4,8 @@ m4_define([weston_micro_version], [91]) > > m4_define([weston_version], > > [weston_major_version.weston_minor_version.weston_micro_version]) > > > > +m4_define([WAYLAND_PREREQ_VERSION], "1.10.0") > > how comes the line above uses [] and here you use ""? is that intentional? > (I keep forgetting whether there's a difference between the two in m4) Yeah, I'm not that sure about using a m4 define. It is one way to do it, but the quotes do look suspicious. FWIW, Mesa uses a big list of common dependency variables too, maybe copy that approach? CC'ing Quentin and Emil, they probably know what's good. Thanks, pq > > + > > AC_PREREQ([2.64]) > > AC_INIT([weston], > > [weston_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 > > > > > > @@ -332,7 +334,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], > > @@ -386,9 +388,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"], [ > > -- > > 1.9.1 > >
pgpOfPgqk1rXB.pgp
Description: OpenPGP digital signature
_______________________________________________ wayland-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/wayland-devel
