Xwayland DDX: build breaks in configuration

[Kristian Høgsberg]

On Sun, Apr 6, 2014 at 8:05 AM, Gaetan Nadon <memsize at videotron.ca> wrote:
> On 14-04-06 06:02 AM, Yaakov (Cygwin/X) wrote:
>
> Any idea how to fix this? I would prefer that the RC I'm still trying to
> construct will build for most people...
>
>
> Adding a copy of wayland-scanner.m4 to m4/ should work.
>
> This would work if this macro does not itself introduces more dependencies.
> The drawback is dual maintenance, as it must be updated when the original
> one is changed. In addition, a user could end up with both out-of-sync
> macros being on the search path, not really aware of which one will be
> picked-up.
>
> Another approach is to adopt the common idiom for "auto" detected features.
> If the macro is missing, for whatever reason, disable wayland building. It
> will require some m4 coding.
>
> Something like this:

We only need the wayland scanner for when we add the glamor + dri3
support, so we can just drop the WAYLAND_SCANNER_RULES line from
configure for now.

When I send the patch for glamor + dri3 support, I'll change this to
do what we do for mesa: just look for the scanner binary and then add
the four lines of Makefile.am to generate the files.  I've given up on
trying to share the Makefile.am logic for this, it's more work than
just copy-and-pasting this:

%-protocol.c : %.xml
        $(AM_V_GEN)$(WAYLAND_SCANNER) code < $< > $@

%-client-protocol.h : %.xml
        $(AM_V_GEN)$(WAYLAND_SCANNER) client-header < $< > $@

Anyway, patch is on the list to remove the configure.ac macro along
with patches to build without GLX and xshmfence.

Kristian

> diff --git a/configure.ac b/configure.ac
> index 70eceab..b13f180 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -2442,6 +2442,8 @@ AM_CONDITIONAL(XFAKESERVER, [test "x$KDRIVE" = xyes &&
> test "x$XFAKE" = xyes])
>  dnl Xwayland DDX
>
>  PKG_CHECK_MODULES(XWAYLANDMODULES, [wayland-client libdrm epoxy],
> [have_xwayland=yes], [have_xwayland=no])
> +m4_ifdef([WAYLAND_SCANNER_RULES], [have_xwayland=yes], [have_xwayland=no])
> +
>  AC_MSG_CHECKING([whether to build Xwayland DDX])
>  if test "x$XWAYLAND" = xauto; then
>     XWAYLAND="$have_xwayland"
> @@ -2458,7 +2460,8 @@ if test "x$XWAYLAND" = xyes; then
>      XWAYLAND_SYS_LIBS="$XWAYLANDMODULES_LIBS $GLX_SYS_LIBS"
>      AC_SUBST([XWAYLAND_LIBS])
>      AC_SUBST([XWAYLAND_SYS_LIBS])
> -    WAYLAND_SCANNER_RULES(['$(top_srcdir)/hw/xwayland'])
> +        m4_ifdef([WAYLAND_SCANNER_RULES],
> WAYLAND_SCANNER_RULES(['$(top_srcdir)/hw/xwayland']))
> +
>  fi
>
> Not tested with xwayland installed, but no more build breaks without
> xwayland. Worth a try.
>
> _______________________________________________
> xorg-devel at lists.x.org: X.Org development
> Archives: http://lists.x.org/archives/xorg-devel
> Info: http://lists.x.org/mailman/listinfo/xorg-devel