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

Andreas Boll ab at kemper.freedesktop.org
Thu May 30 09:27:44 UTC 2013


Module: Mesa
Branch: 9.1
Commit: ca79663f927d3aaeb0b23bb6ae432e9279c9f165
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=ca79663f927d3aaeb0b23bb6ae432e9279c9f165

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>
(cherry picked from commit 998d975e38db7478781130b42a4fb68d6b181055)

---

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

diff --git a/configure.ac b/configure.ac
index 36065f1..5da5220 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1078,7 +1078,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