[Mesa-dev] [PATCH 2/2] configure.ac: Build dricommon when dri is enabled

Matt Turner mattst88 at gmail.com
Tue Mar 5 10:57:38 PST 2013


Commit 67ef7559 added an || test "x$enable_dri" check, which was just
wrong since the whole block was enclosed in if test "x$enable_dri". The
comment added with it stated the actual intent: to enable when any DRI
drivers were built.
---
 configure.ac |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/configure.ac b/configure.ac
index 925dc6b..a25ec2c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1079,7 +1079,7 @@ if test "x$enable_dri" = xyes; then
     LIBS="$save_LIBS"
 
     # 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; then
+    if test -n "$DRI_DIRS" -a "x$DRI_DIRS" != xswrast -o "x$HAVE_ST_DRI" = xyes; then
         # ... libdrm is required
         if test "x$have_libdrm" != xyes; then
             AC_MSG_ERROR([DRI drivers requires libdrm >= $LIBDRM_REQUIRED])
-- 
1.7.8.6



More information about the mesa-dev mailing list