Merge remote branch 'upstream/gallium-0.1' into nouveau-gallium-0.1

diff --combined configs/default
index c1bc5fb01d09252a5a9a7ac4f069333dbc8bb74e,ef9c5fda1eba59dc1e0717cc7bf769e1fe5a1e79..8c6ae8484066401cb5b9cf3c5f436ac776e5d195
--- 1/configs/default
--- 2/configs/default
+++ b/configs/default
@@@ -68,9 -68,9 +68,9 @@@ PROGRAM_DIRS = demos redbook samples gl
  
  
  # Gallium directories and 
- GALLIUM_AUXILIARY_DIRS = draw cso_cache pipebuffer tgsi sct translate rtasm util
+ GALLIUM_AUXILIARY_DIRS = draw translate cso_cache pipebuffer tgsi sct rtasm util
  GALLIUM_AUXILIARIES = $(foreach DIR,$(GALLIUM_AUXILIARY_DIRS),$(TOP)/src/gallium/auxiliary/$(DIR)/lib$(DIR).a)
 -GALLIUM_DRIVER_DIRS = softpipe i915simple i965simple failover
 +GALLIUM_DRIVER_DIRS = softpipe i915simple i965simple nv04 nv10 nv30 nv40 nv50 failover
  GALLIUM_WINSYS_COMMON_DIRS =
  GALLIUM_DRIVERS = $(foreach DIR,$(GALLIUM_DRIVER_DIRS),$(TOP)/src/gallium/drivers/$(DIR)/lib$(DIR).a)
  GALLIUM_WINSYS_DIRS = xlib egl_xlib

diff --combined configs/linux-dri
index 74f81bf83b6f34a62e7c1626bce862315c8aad99,380cd3812ff377b505410bd593e050cbdb274df4..ae9098c49399a390544747c0cde7d2d8dd033a21
--- 1/configs/linux-dri
--- 2/configs/linux-dri
+++ b/configs/linux-dri
@@@ -46,18 -46,8 +46,8 @@@ GL_LIB_DEPS   = $(EXTRA_LIB_PATH) -lX1
                  $(LIBDRM_LIB)
  
  
- # This is now 0 by default since it seems to confuse the hell out of people
- # and generate a lot of extra noise on bugzilla.  If you need to build with
- # EGL, do 'make linux-dri USING_EGL=1'
- 
- USING_EGL=0
- 
  # Directories
- SRC_DIRS := glx/x11 $(SRC_DIRS)
- ifeq ($(USING_EGL), 1)
- SRC_DIRS := egl $(SRC_DIRS)
- PROGRAM_DIRS = egl
- endif
+ SRC_DIRS := glx/x11 egl $(SRC_DIRS)
  
  
  
@@@ -68,4 -58,4 +58,4 @@@ GALLIUM_WINSYS_COMMON_DIRS = intel_dr
  
  # gamma are missing because they have not been converted to use the new
  # interface.
 -DRI_DIRS = intel 
 +DRI_DIRS = nouveau