Xwayland DDX: build breaks in configuration

[Gaetan Nadon]

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:

    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.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.x.org/archives/xorg-devel/attachments/20140406/2a588a50/attachment.html>