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

[Bryce Harrington]

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.

> ---
>  configure.ac | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/configure.ac b/configure.ac
> index 1db9f79..e5f395f 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -100,7 +100,7 @@ if test x$enable_xwayland = xyes; then
>  
>    AC_ARG_WITH(xserver-path, AS_HELP_STRING([--with-xserver-path=PATH],
>                [Path to X server]), [XSERVER_PATH="$withval"],
> -              [XSERVER_PATH="$bindir/Xwayland"])
> +              [XSERVER_PATH="/usr/bin/Xwayland"])
>    AC_SUBST([XSERVER_PATH])
>    if test x$enable_xwayland_test = xyes; then
>      PKG_CHECK_MODULES([XWAYLAND_TEST], x11)
> -- 
> 2.1.4
> 
> _______________________________________________
> wayland-devel mailing list
> wayland-devel at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/wayland-devel