[Mesa-dev] [PATCH] Fix build of swrast only without libdrm

[Matt Turner]

On Thu, Feb 28, 2013 at 10:39 AM, Daniel Martin <consume.noise at gmail.com> wrote:
>
> Signed-off-by: Daniel Martin <consume.noise at gmail.com>
> ---
> There's a small logic error preventing mesa to be build with swrast only
> and not having libdrm.
>
> v2: "|| test" replaced by "-a"
>
>  configure.ac | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/configure.ac b/configure.ac
> index 5f95a78..7852595 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -1095,7 +1095,7 @@ if test "x$enable_dri" = xyes; then
>      fi
>
>      # if we are building any dri driver other than swrast or using the dri state tracker ...
> -    if test -n "$DRI_DIRS" -a x"$DRI_DIRS" != xswrast || test "x$enable_dri" = xyes; then
> +    if test -n "$DRI_DIRS" -a x"$DRI_DIRS" != xswrast -a "x$enable_dri" = xyes; then
>          # ... libdrm is required
>          if test "x$have_libdrm" != xyes; then
>              AC_MSG_ERROR([DRI drivers requires libdrm >= $LIBDRM_REQUIRED])
> --
> 1.8.1.4

Committed. Thanks!