Skip to contentSkip to conversation

Fix build of swrast only without libdrm

PATCH In review Daniel Martin 2 participants 2 messages Feb 28, 2013

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Fix build of swrast only without libdrm

---
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(-)
configure.ac +1 -1
index 5701f8a..aa1b38a 100644
@@ -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])
Signature · 1 line
1.7.2.5
#1 lore raw
Quoted 14 lines · Daniel Martin

---
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(-)
configure.ac +0 -0
index 5701f8a..aa1b38a 100644

configure.ac if test "x$enable_dri" = xyes; then · line 1092

Quoted 5 lines
configure.ac +1 -1
@@ -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)