--- Mesa-7.0.2/configs/default.alt	2007-11-01 18:30:52 +0300

+++ Mesa-7.0.2/configs/default	2008-01-05 13:01:28 +0300

@@ -25,8 +25,8 @@ GLU_CFLAGS = 

 # Misc tools and flags

 MKLIB_OPTIONS = 

-MKDEP = makedepend

-MKDEP_OPTIONS = -fdepend

+MKDEP = true

+MKDEP_OPTIONS =

 MAKE = make

 INSTALL = $(TOP)/bin/minstall

@@ -81,8 +81,8 @@ APP_LIB_DEPS = -lm

 # Installation directories (for make install)

-INSTALL_DIR = /usr/local

-DRI_DRIVER_INSTALL_DIR = /usr/X11R6/lib/modules/dri

+INSTALL_DIR = /usr

+DRI_DRIVER_INSTALL_DIR = /usr/$(LIB_DIR)/X11/modules/dri

 # Where libGL will look for DRI hardware drivers

 DRI_DRIVER_SEARCH_DIR = $(DRI_DRIVER_INSTALL_DIR)

--- Mesa-7.0.2/configs/linux-dri-x86-64.alt	2007-06-22 02:10:53 +0400

+++ Mesa-7.0.2/configs/linux-dri-x86-64	2008-01-05 13:44:49 +0300

@@ -5,7 +5,7 @@ include $(TOP)/configs/linux-dri

 CONFIG_NAME = linux-dri-x86-64

-ARCH_FLAGS = -m64

+ARCH_FLAGS += -m64

 ASM_FLAGS = -DUSE_X86_64_ASM

 ASM_SOURCES = $(X86-64_SOURCES)

@@ -13,12 +13,4 @@ ASM_API = $(X86-64_API)

 LIB_DIR = lib64

-# Library/program dependencies

-EXTRA_LIB_PATH=-L/usr/X11R6/lib64

-

-# ffb, gamma, and sis are missing because they have not be converted to use

-# the new interface.  i810 are missing because there is no x86-64

-# system where they could *ever* be used.

-#

-DRI_DIRS = i915tex i915 i965 mach64 mga r128 r200 radeon tdfx unichrome savage r300

-

+DRI_DIRS += i915 i965 sis unichrome

--- Mesa-7.0.2/configs/linux-dri-x86.alt	2007-11-01 22:09:01 +0300

+++ Mesa-7.0.2/configs/linux-dri-x86	2008-01-05 13:44:32 +0300

@@ -6,9 +6,10 @@ include $(TOP)/configs/linux-dri

 CONFIG_NAME = linux-dri-x86

 # Add -m32 to CFLAGS:

-ARCH_FLAGS = -m32

+ARCH_FLAGS += -m32

 ASM_FLAGS = -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM

 ASM_SOURCES = $(X86_SOURCES)

 ASM_API = $(X86_API)

+DRI_DIRS += i810 i915 i965 sis unichrome

--- Mesa-7.0.2/configs/linux-dri.alt	2007-11-01 22:09:01 +0300

+++ Mesa-7.0.2/configs/linux-dri	2008-01-05 13:44:17 +0300

@@ -13,11 +13,11 @@ CXX = g++

 #MKDEP = gcc -M

 #MKDEP_OPTIONS = -MF depend

-OPT_FLAGS  = -O -g

+OPT_FLAGS  = -pipe -Os

 PIC_FLAGS  = -fPIC

 # Add '-DGLX_USE_TLS' to ARCH_FLAGS to enable TLS support.

-ARCH_FLAGS ?=

+ARCH_FLAGS = -DGLX_USE_TLS

 DEFINES = -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE \

 	-D_BSD_SOURCE -D_GNU_SOURCE \

@@ -25,7 +25,7 @@ DEFINES = -D_POSIX_SOURCE -D_POSIX_C_SOU

 	-DGLX_DIRECT_RENDERING -DGLX_INDIRECT_RENDERING \

 	-DHAVE_ALIAS -DHAVE_POSIX_MEMALIGN

-X11_INCLUDES = -I/usr/X11R6/include

+X11_INCLUDES =

 CFLAGS = -Wall -Wmissing-prototypes -std=c99 -ffast-math \

 	$(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES) $(ASM_FLAGS)

@@ -41,7 +41,7 @@ CXXFLAGS += -fno-strict-aliasing

 ASM_SOURCES = 

 # Library/program dependencies

-EXTRA_LIB_PATH=-L/usr/X11R6/lib

+EXTRA_LIB_PATH=

 LIBDRM_CFLAGS = `pkg-config --cflags libdrm`

 LIBDRM_LIB = `pkg-config --libs libdrm`

@@ -71,5 +71,4 @@ WINDOW_SYSTEM=dri

 # gamma are missing because they have not been converted to use the new

 # interface.

-DRI_DIRS = i810 i915tex i915 i965 mach64 mga r128 r200 r300 radeon s3v \

-	savage sis tdfx trident unichrome ffb

+DRI_DIRS = mach64 mga nouveau r128 r200 r300 radeon savage tdfx

--- Mesa-7.0.2/configs/linux.alt	2007-11-01 22:09:01 +0300

+++ Mesa-7.0.2/configs/linux	2008-01-05 13:01:28 +0300

@@ -8,7 +8,7 @@ CONFIG_NAME = linux

 CC = gcc

 CXX = g++

-OPT_FLAGS  = -O3 -g

+OPT_FLAGS  = -pipe -Os

 PIC_FLAGS  = -fPIC

 # Add '-DGLX_USE_TLS' to ARCH_FLAGS to enable TLS support.  Add -m32

@@ -20,7 +20,7 @@ DEFINES = -D_POSIX_SOURCE -D_POSIX_C_SOU

 	-D_BSD_SOURCE -D_GNU_SOURCE \

 	-DPTHREADS -DUSE_XSHM -DHAVE_POSIX_MEMALIGN

-X11_INCLUDES = -I/usr/X11R6/include

+X11_INCLUDES =

 CFLAGS = -Wall -Wmissing-prototypes $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) \

 	$(DEFINES) $(ASM_FLAGS) $(X11_INCLUDES) -std=c99 -ffast-math 

--- Mesa-7.0.2/src/mesa/drivers/dri/Makefile.template.alt	2007-11-01 18:30:52 +0300

+++ Mesa-7.0.2/src/mesa/drivers/dri/Makefile.template	2008-01-05 13:01:28 +0300

@@ -75,7 +75,7 @@ default: depend symlinks $(LIBNAME) $(TO

 $(LIBNAME): $(OBJECTS) $(MESA_MODULES) $(WINOBJ) Makefile $(TOP)/src/mesa/drivers/dri/Makefile.template

 	$(TOP)/bin/mklib -ldflags '$(LDFLAGS)' -noprefix -o $@ \

-		$(OBJECTS) $(MESA_MODULES) $(WINOBJ) $(DRI_LIB_DEPS)

+		$(OBJECTS) $(MESA_MODULES) -L$(TOP)/$(LIB_DIR) -lGL $(WINOBJ) $(DRI_LIB_DEPS)

 $(TOP)/$(LIB_DIR)/$(LIBNAME): $(LIBNAME)