Mesa (7.11): Fix broken merge in cherry-pick from 42cdf407

Benjamin Franzke bnf at kemper.freedesktop.org
Wed Jul 27 07:30:36 UTC 2011


Module: Mesa
Branch: 7.11
Commit: 7555eb7478f5e43084f000231c530713e5c5e3b3
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=7555eb7478f5e43084f000231c530713e5c5e3b3

Author: Benjamin Franzke <benjaminfranzke at googlemail.com>
Date:   Wed Jul 27 09:21:39 2011 +0200

Fix broken merge in cherry-pick from 42cdf407

Was cherry-picked to 337102684b78ce860337f8c7db446fbc2b227553.

---

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

diff --git a/configure.ac b/configure.ac
index 3f8cc06..3abb533 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1240,7 +1240,7 @@ if test "x$enable_gbm" = xyes; then
                       AC_MSG_ERROR([gbm needs udev]))
     GBM_LIB_DEPS="$DLOPEN_LIBS $LIBUDEV_LIBS"
 
-    if test "x$enable_dri" = xyes; then
+    if test "$mesa_driver" = dri; then
         GBM_BACKEND_DIRS="$GBM_BACKEND_DIRS dri"
         if test "$SHARED_GLAPI" -eq 0; then
             AC_MSG_ERROR([gbm_dri requires --enable-shared-glapi])




More information about the mesa-commit mailing list