[PATCH weston 1/2] configure.ac: Don't look for Xwayland in the weston install destination

[Bryce Harrington]

On Mon, Feb 09, 2015 at 02:34:49PM -0800, Bryce Harrington wrote:
> On Mon, Feb 09, 2015 at 09:57:28AM -0600, Derek Foreman wrote:
> > Xwayland isn't part of this distribution so looking for Xwayland in
> > weston's install dir will cause distcheck to fail.  Let's set the
> > default to /usr/bin where it's likely to live.
> > 
> > It can still be overriden during configure exactly as before.
> > 
> > Signed-off-by: Derek Foreman <derekf at osg.samsung.com>
> Tested-by: Bryce Harrington <bryce at osg.samsung.com>
> 
> Verified that --with-xserver-path=PATH allows overriding:
> 
>  dorset+14.04:~/build/Wayland/weston$ grep XSERVER Makefile
>  XSERVER_PATH = /home/bryce/build/Wayland/install/bin/Xwayland
> 	     -DXSERVER_PATH='"/home/bryce/build/Wayland/install/bin/Xwayland"'
> 
> The xwayland test isn't passing for me, but I'm going to rebuild
> Xwayland from scratch to retest.

Turns out the issue I've run into is that the --with-xserver-path
setting doesn't get passed down into distcheck, which calls configure
like this:

          && $(am__cd) $(distdir)/_build \
          && ../configure \
            $(AM_DISTCHECK_CONFIGURE_FLAGS) \
            $(DISTCHECK_CONFIGURE_FLAGS) \
            --srcdir=.. --prefix="$$dc_install_base" \
          && $(MAKE) $(AM_MAKEFLAGS) \

Setting --with-xserver-path in AM_DISTCHECK_CONFIGURE_FLAGS doesn't seem
to work (it ends up confusing config.sub mightily), but setting it in
DISTCHECK_CONFIGURE_FLAGS seems to produce valid results.

Bryce

------------------------------------------------------------------------

>From 9d72d57991269fc257e2e6e52cf9079b01a64993 Mon Sep 17 00:00:00 2001
From: Bryce Harrington <bryce at osg.samsung.com>
Date: Mon, 9 Feb 2015 18:13:15 -0800
Subject: [PATCH] build:  Pass along any user-specified xserver path to
 distcheck

Signed-off-by: Bryce Harrington <bryce at osg.samsung.com>
---
 Makefile.am | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Makefile.am b/Makefile.am
index 1864b70..0ee674d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,6 +9,7 @@ noinst_LTLIBRARIES =
 BUILT_SOURCES =
 
 AM_DISTCHECK_CONFIGURE_FLAGS = --disable-setuid-install
+DISTCHECK_CONFIGURE_FLAGS = --with-xserver-path='@XSERVER_PATH@'
 
 EXTRA_DIST = weston.ini.in ivi-shell/weston.ini.in
 
-- 
1.9.1