Mesa (master): Fix build of swrast only without libdrm

Matt Turner mattst88 at kemper.freedesktop.org
Mon Mar 4 18:11:21 UTC 2013


Module: Mesa
Branch: master
Commit: 998d975e38db7478781130b42a4fb68d6b181055
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=998d975e38db7478781130b42a4fb68d6b181055

Author: Daniel Martin <consume.noise at gmail.com>
Date:   Thu Feb 28 19:39:06 2013 +0100

Fix build of swrast only without libdrm

Reviewed-by: Matt Turner <mattst88 at gmail.com>
Signed-off-by: Daniel Martin <consume.noise at gmail.com>

---

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

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])




More information about the mesa-commit mailing list