From: Keith Whitwell <keithw@vmware.com>
Date: Tue, 22 Dec 2009 09:40:39 +0000 (+0000)
Subject: Merge branch 'i965g-restart'
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=aa02683e45f1eaf61bba2ba7eeda7686efeed2ca;p=mesa.git

Merge branch 'i965g-restart'

Conflicts:
	configure.ac
---

aa02683e45f1eaf61bba2ba7eeda7686efeed2ca
diff --cc configure.ac
index dd0c78547c4,ee1f914deda..d83dd4315b7
--- a/configure.ac
+++ b/configure.ac
@@@ -1216,15 -1206,13 +1216,15 @@@ dn
  dnl Gallium Intel configuration
  dnl
  AC_ARG_ENABLE([gallium-intel],
 -    [AS_HELP_STRING([--disable-gallium-intel],
 -        [build gallium intel @<:@default=enabled@:>@])],
 +    [AS_HELP_STRING([--enable-gallium-intel],
 +        [build gallium intel @<:@default=disabled@:>@])],
      [enable_gallium_intel="$enableval"],
 -    [enable_gallium_intel=yes])
 +    [enable_gallium_intel=auto])
  if test "x$enable_gallium_intel" = xyes; then
-     GALLIUM_WINSYS_DRM_DIRS="$GALLIUM_WINSYS_DRM_DIRS intel"
-     GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS i915"
+     GALLIUM_WINSYS_DRM_DIRS="$GALLIUM_WINSYS_DRM_DIRS intel i965"
+     GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS i915 i965"
 +elif test "x$enable_gallium_intel" = xauto; then
-     GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS i915"
++    GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS i915 i965"
  fi
  
  dnl