Mesa (mesa_7_7_branch): gallium: DRI drivers enabled by default, Xorg drivers auto by default.

[Jakob Bornecrantz]

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

Author: Jakob Bornecrantz <jakob at vmware.com>
Date:   Fri Dec  4 18:50:29 2009 +0000

gallium: DRI drivers enabled by default, Xorg drivers auto by default.

This change enabled gallium dri drivers by default under the
configure build system. Xorg drivers are built automaticaly
if a Xorg dev enviroment is installed and the Xorg version
is higher then 1.6.0.

---

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

diff --git a/configure.ac b/configure.ac
index 054857d..25e4321 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1143,7 +1143,14 @@ yes)
         GALLIUM_STATE_TRACKERS_DIRS=glx
         ;;
     dri)
-        test "x$enable_egl" = xyes && GALLIUM_STATE_TRACKERS_DIRS=egl
+        GALLIUM_STATE_TRACKERS_DIRS="dri"
+        if test "x$enable_egl" = xyes; then
+            GALLIUM_STATE_TRACKERS_DIRS="$GALLIUM_STATE_TRACKERS_DIRS egl"
+        fi
+        # Have only tested st/xorg on 1.6.0 servers
+        PKG_CHECK_MODULES(XORG, [xorg-server >= 1.6.0],
+            HAVE_XORG="yes"; GALLIUM_STATE_TRACKERS_DIRS="$GALLIUM_STATE_TRACKERS_DIRS xorg",
+            HAVE_XORG="no")
         ;;
     esac
     ;;