[PATCH xserver 1/2] configure.ac: Make Xephyr dependency error message more informative

[Jamey Sharp]

Reviewed-by: Jamey Sharp <jamey at minilop.net>

On 12/17/11, Jeremy Huddleston <jeremyhu at apple.com> wrote:
> Signed-off-by: Jeremy Huddleston <jeremyhu at apple.com>
> ---
>  configure.ac |    8 +++-----
>  1 files changed, 3 insertions(+), 5 deletions(-)
>
> diff --git a/configure.ac b/configure.ac
> index 518eb06..eb99c70 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -2020,12 +2020,10 @@ if test "$KDRIVE" = yes; then
>          XEPHYR_REQUIRED_LIBS="$XEPHYR_REQUIRED_LIBS $LIBGL libdrm"
>      fi
>
> -    PKG_CHECK_MODULES(XEPHYR, $XEPHYR_REQUIRED_LIBS, [xephyr="yes"],
> [xephyr="no"])
>      if test "x$XEPHYR" = xauto; then
> -        XEPHYR=$xephyr
> -    fi
> -    if test "x$XEPHYR" = xyes && test "x$xephyr" = xno; then	
> -        AC_MSG_ERROR([Xephyr dependencies missing])
> +        PKG_CHECK_MODULES(XEPHYR, $XEPHYR_REQUIRED_LIBS, [XEPHYR="yes"],
> [XEPHYR="no"])
> +    elif test "x$XEPHYR" = xyes ; then
> +        PKG_CHECK_MODULES(XEPHYR, $XEPHYR_REQUIRED_LIBS)
>      fi
>
>      # Xephyr needs nanosleep() which is in librt on Solaris
> --
> 1.7.7.4
>
> _______________________________________________
> 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
>