diff mbox

Fix build of swrast only without libdrm

Message ID 1362052689-16407-1-git-send-email-consume.noise@gmail.com (mailing list archive)
State New, archived
Headers show

Commit Message

Daniel Martin Feb. 28, 2013, 11:58 a.m. UTC
Signed-off-by: Daniel Martin <consume.noise@gmail.com>
---
There's a small logic error preventing mesa to be build with swrast only
and not having libdrm.

 configure.ac |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

Comments

Matt Turner Feb. 28, 2013, 5:24 p.m. UTC | #1
On Thu, Feb 28, 2013 at 3:58 AM, Daniel Martin <consume.noise@gmail.com> wrote:
>
> Signed-off-by: Daniel Martin <consume.noise@gmail.com>
> ---
> There's a small logic error preventing mesa to be build with swrast only
> and not having libdrm.
>
>  configure.ac |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/configure.ac b/configure.ac
> index 5701f8a..aa1b38a 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -1089,7 +1089,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 && test "x$enable_dri" = xyes; then

While modifying this line of code, please change '&& test' to -a.

(mesa patches to go mesa-dev, not dri-devel)
diff mbox

Patch

diff --git a/configure.ac b/configure.ac
index 5701f8a..aa1b38a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1089,7 +1089,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 && test "x$enable_dri" = xyes; then
         # ... libdrm is required
         if test "x$have_libdrm" != xyes; then
             AC_MSG_ERROR([DRI drivers requires libdrm >= $LIBDRM_REQUIRED])