diff options
| author | Keith Whitwell <[email protected]> | 2009-12-22 09:40:39 +0000 |
|---|---|---|
| committer | Keith Whitwell <[email protected]> | 2009-12-22 09:40:39 +0000 |
| commit | aa02683e45f1eaf61bba2ba7eeda7686efeed2ca (patch) | |
| tree | 63e0ef2fa85e5d7ebd6ffc6ae9043ce0819251a2 /configure.ac | |
| parent | ebbc73d1aed283c9bc4aa2b37bed4374bbaec5b5 (diff) | |
| parent | 0fc4dd3819af252c028ed43bbd668b4f34104e32 (diff) | |
Merge branch 'i965g-restart'
Conflicts:
configure.ac
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index dd0c78547c4..d83dd4315b7 100644 --- a/configure.ac +++ b/configure.ac @@ -1221,10 +1221,10 @@ AC_ARG_ENABLE([gallium-intel], [enable_gallium_intel="$enableval"], [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 |