svn merge ^/branches/released .

4 files changed, 493 insertions, 493 deletions

diff --git a/mesalib/configs/autoconf.in b/mesalib/configs/autoconf.in
index 9bdbefebd..f33b4f296 100644
--- a/mesalib/configs/autoconf.in
+++ b/mesalib/configs/autoconf.in
@@ -1,199 +1,199 @@
-# Autoconf configuration
-
-# Pull in the defaults
-include $(TOP)/configs/default
-
-# This is generated by configure
-CONFIG_NAME = autoconf
-
-# Compiler and flags
-CC = @CC@
-CXX = @CXX@
-OPT_FLAGS = @OPT_FLAGS@
-ARCH_FLAGS = @ARCH_FLAGS@
-ASM_FLAGS = @ASM_FLAGS@
-PIC_FLAGS = @PIC_FLAGS@
-DEFINES = @DEFINES@
-API_DEFINES = @API_DEFINES@
-GLES_OVERLAY = @GLES_OVERLAY@
-CFLAGS = @CPPFLAGS@ @CFLAGS@ \
-	$(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(ASM_FLAGS) $(DEFINES)
-CXXFLAGS = @CPPFLAGS@ @CXXFLAGS@ \
-	$(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES)
-LDFLAGS = @LDFLAGS@
-EXTRA_LIB_PATH = @EXTRA_LIB_PATH@
-RADEON_CFLAGS = @RADEON_CFLAGS@
-RADEON_LDFLAGS = @RADEON_LDFLAGS@
-INTEL_LIBS = @INTEL_LIBS@
-INTEL_CFLAGS = @INTEL_CFLAGS@
-X11_LIBS = @X11_LIBS@
-X11_CFLAGS = @X11_CFLAGS@
-LLVM_CFLAGS = @LLVM_CFLAGS@
-LLVM_LDFLAGS = @LLVM_LDFLAGS@
-LLVM_LIBS = @LLVM_LIBS@
-GLW_CFLAGS = @GLW_CFLAGS@
-GLUT_CFLAGS = @GLUT_CFLAGS@
-
-TALLOC_LIBS = @TALLOC_LIBS@
-TALLOC_CFLAGS = @TALLOC_CFLAGS@
-
-# dlopen
-DLOPEN_LIBS = @DLOPEN_LIBS@
-
-# Source selection
-MESA_ASM_SOURCES = @MESA_ASM_SOURCES@
-GLAPI_ASM_SOURCES = @GLAPI_ASM_SOURCES@
-
-# Misc tools and flags
-MAKE = @MAKE@
-SHELL = @SHELL@
-MKLIB_OPTIONS = @MKLIB_OPTIONS@
-MKDEP = @MKDEP@
-MKDEP_OPTIONS = @MKDEP_OPTIONS@
-INSTALL = @INSTALL@
-
-# Python and flags (generally only needed by the developers)
-PYTHON2 = python
-PYTHON_FLAGS = -t -O -O
-
-# Library names (base name)
-GL_LIB = GL
-GLU_LIB = GLU
-GLUT_LIB = glut
-GLW_LIB = GLw
-OSMESA_LIB = @OSMESA_LIB@
-GLESv1_CM_LIB = GLESv1_CM
-GLESv2_LIB = GLESv2
-VG_LIB = OpenVG
-
-# Library names (actual file names)
-GL_LIB_NAME = @GL_LIB_NAME@
-GLU_LIB_NAME = @GLU_LIB_NAME@
-GLUT_LIB_NAME = @GLUT_LIB_NAME@
-GLW_LIB_NAME = @GLW_LIB_NAME@
-OSMESA_LIB_NAME = @OSMESA_LIB_NAME@
-EGL_LIB_NAME = @EGL_LIB_NAME@
-GLESv1_CM_LIB_NAME = @GLESv1_CM_LIB_NAME@
-GLESv2_LIB_NAME = @GLESv2_LIB_NAME@
-VG_LIB_NAME = @VG_LIB_NAME@
-
-# Globs used to install the lib and all symlinks
-GL_LIB_GLOB = @GL_LIB_GLOB@
-GLU_LIB_GLOB = @GLU_LIB_GLOB@
-GLUT_LIB_GLOB = @GLUT_LIB_GLOB@
-GLW_LIB_GLOB = @GLW_LIB_GLOB@
-OSMESA_LIB_GLOB = @OSMESA_LIB_GLOB@
-EGL_LIB_GLOB = @EGL_LIB_GLOB@
-GLESv1_CM_LIB_GLOB = @GLESv1_CM_LIB_GLOB@
-GLESv2_LIB_GLOB = @GLESv2_LIB_GLOB@
-VG_LIB_GLOB = @VG_LIB_GLOB@
-
-# Directories to build
-LIB_DIR = @LIB_DIR@
-SRC_DIRS = @SRC_DIRS@
-GLU_DIRS = @GLU_DIRS@
-DRIVER_DIRS = @DRIVER_DIRS@
-EGL_DRIVERS_DIRS = @EGL_DRIVERS_DIRS@
-GALLIUM_DIRS = @GALLIUM_DIRS@
-GALLIUM_DRIVERS_DIRS = @GALLIUM_DRIVERS_DIRS@
-GALLIUM_WINSYS_DIRS = @GALLIUM_WINSYS_DIRS@
-GALLIUM_TARGET_DIRS = @GALLIUM_TARGET_DIRS@
-GALLIUM_STATE_TRACKERS_DIRS = @GALLIUM_STATE_TRACKERS_DIRS@
-GALLIUM_AUXILIARIES = $(TOP)/src/gallium/auxiliary/libgallium.a
-GALLIUM_DRIVERS = $(foreach DIR,$(GALLIUM_DRIVERS_DIRS),$(TOP)/src/gallium/drivers/$(DIR)/lib$(DIR).a)
-
-# Driver specific build vars
-DRI_DIRS = @DRI_DIRS@ 
-EGL_PLATFORMS = @EGL_PLATFORMS@
-EGL_CLIENT_APIS = @EGL_CLIENT_APIS@
-
-# Dependencies
-X11_INCLUDES = @X11_INCLUDES@
-
-# GLw motif setup
-GLW_SOURCES = @GLW_SOURCES@
-MOTIF_CFLAGS = @MOTIF_CFLAGS@
-
-# Library/program dependencies
-GL_LIB_DEPS = $(EXTRA_LIB_PATH) @GL_LIB_DEPS@
-OSMESA_LIB_DEPS = -L$(TOP)/$(LIB_DIR) @OSMESA_MESA_DEPS@ \
-	$(EXTRA_LIB_PATH) @OSMESA_LIB_DEPS@
-EGL_LIB_DEPS = $(EXTRA_LIB_PATH) @EGL_LIB_DEPS@
-GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) @GLU_MESA_DEPS@ \
-	$(EXTRA_LIB_PATH) @GLU_LIB_DEPS@
-GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) @GLUT_MESA_DEPS@ \
-	$(EXTRA_LIB_PATH) @GLUT_LIB_DEPS@
-GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) @GLW_MESA_DEPS@ \
-	$(EXTRA_LIB_PATH) @GLW_LIB_DEPS@
-APP_LIB_DEPS = $(EXTRA_LIB_PATH) @APP_LIB_DEPS@
-GLESv1_CM_LIB_DEPS = $(EXTRA_LIB_PATH) @GLESv1_CM_LIB_DEPS@
-GLESv2_LIB_DEPS = $(EXTRA_LIB_PATH) @GLESv2_LIB_DEPS@
-VG_LIB_DEPS = $(EXTRA_LIB_PATH) @VG_LIB_DEPS@
-
-# DRI dependencies
-DRI_LIB_DEPS = $(EXTRA_LIB_PATH) @DRI_LIB_DEPS@
-LIBDRM_CFLAGS = @LIBDRM_CFLAGS@
-LIBDRM_LIB = @LIBDRM_LIBS@
-DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@
-EXPAT_INCLUDES = @EXPAT_INCLUDES@
-
-# Autoconf directories
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-libdir = @libdir@
-includedir = @includedir@
-
-# Installation directories (for make install)
-INSTALL_DIR = $(prefix)
-INSTALL_LIB_DIR = $(libdir)
-INSTALL_INC_DIR = $(includedir)
-
-# DRI installation directories
-DRI_DRIVER_INSTALL_DIR = @DRI_DRIVER_INSTALL_DIR@
-
-# Where libGL will look for DRI hardware drivers
-DRI_DRIVER_SEARCH_DIR = @DRI_DRIVER_SEARCH_DIR@
-
-# EGL driver install directory
-EGL_DRIVER_INSTALL_DIR = @EGL_DRIVER_INSTALL_DIR@
-
-# Xorg driver install directory (for xorg state-tracker)
-XORG_DRIVER_INSTALL_DIR = @XORG_DRIVER_INSTALL_DIR@
-
-# pkg-config substitutions
-GL_PC_REQ_PRIV = @GL_PC_REQ_PRIV@
-GL_PC_LIB_PRIV = @GL_PC_LIB_PRIV@
-GL_PC_CFLAGS = @GL_PC_CFLAGS@
-DRI_PC_REQ_PRIV = @DRI_PC_REQ_PRIV@
-GLU_PC_REQ = @GLU_PC_REQ@
-GLU_PC_REQ_PRIV = @GLU_PC_REQ_PRIV@
-GLU_PC_LIB_PRIV = @GLU_PC_LIB_PRIV@
-GLU_PC_CFLAGS = @GLU_PC_CFLAGS@
-GLUT_PC_REQ_PRIV = @GLUT_PC_REQ_PRIV@
-GLUT_PC_LIB_PRIV = @GLUT_PC_LIB_PRIV@
-GLUT_PC_CFLAGS = @GLUT_PC_CFLAGS@
-GLW_PC_REQ_PRIV = @GLW_PC_REQ_PRIV@
-GLW_PC_LIB_PRIV = @GLW_PC_LIB_PRIV@
-GLW_PC_CFLAGS = @GLW_PC_CFLAGS@
-OSMESA_PC_REQ = @OSMESA_PC_REQ@
-OSMESA_PC_LIB_PRIV = @OSMESA_PC_LIB_PRIV@
-GLESv1_CM_PC_LIB_PRIV = @GLESv1_CM_PC_LIB_PRIV@
-GLESv2_PC_LIB_PRIV = @GLESv2_PC_LIB_PRIV@
-EGL_PC_REQ_PRIV = @GL_PC_REQ_PRIV@
-EGL_PC_LIB_PRIV = @GL_PC_LIB_PRIV@
-EGL_PC_CFLAGS = @GL_PC_CFLAGS@
-
-XCB_DRI2_CFLAGS = @XCB_DRI2_CFLAGS@
-XCB_DRI2_LIBS = @XCB_DRI2_LIBS@
-LIBUDEV_CFLAGS = @LIBUDEV_CFLAGS@
-LIBUDEV_LIBS = @LIBUDEV_LIBS@
-
-MESA_LLVM = @MESA_LLVM@
-
-LLVM_VERSION = @LLVM_VERSION@
-ifneq ($(LLVM_VERSION),)
-  HAVE_LLVM := 0x0$(subst .,0,$(LLVM_VERSION:svn=))
-  DEFINES += -DHAVE_LLVM=$(HAVE_LLVM)
-endif
-
-HAVE_XF86VIDMODE = @HAVE_XF86VIDMODE@
+# Autoconf configuration

+

+# Pull in the defaults

+include $(TOP)/configs/default

+

+# This is generated by configure

+CONFIG_NAME = autoconf

+

+# Compiler and flags

+CC = @CC@

+CXX = @CXX@

+OPT_FLAGS = @OPT_FLAGS@

+ARCH_FLAGS = @ARCH_FLAGS@

+ASM_FLAGS = @ASM_FLAGS@

+PIC_FLAGS = @PIC_FLAGS@

+DEFINES = @DEFINES@

+API_DEFINES = @API_DEFINES@

+GLES_OVERLAY = @GLES_OVERLAY@

+CFLAGS = @CPPFLAGS@ @CFLAGS@ \

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

+CXXFLAGS = @CPPFLAGS@ @CXXFLAGS@ \

+	$(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES)

+LDFLAGS = @LDFLAGS@

+EXTRA_LIB_PATH = @EXTRA_LIB_PATH@

+RADEON_CFLAGS = @RADEON_CFLAGS@

+RADEON_LDFLAGS = @RADEON_LDFLAGS@

+INTEL_LIBS = @INTEL_LIBS@

+INTEL_CFLAGS = @INTEL_CFLAGS@

+X11_LIBS = @X11_LIBS@

+X11_CFLAGS = @X11_CFLAGS@

+LLVM_CFLAGS = @LLVM_CFLAGS@

+LLVM_LDFLAGS = @LLVM_LDFLAGS@

+LLVM_LIBS = @LLVM_LIBS@

+GLW_CFLAGS = @GLW_CFLAGS@

+GLUT_CFLAGS = @GLUT_CFLAGS@

+

+TALLOC_LIBS = @TALLOC_LIBS@

+TALLOC_CFLAGS = @TALLOC_CFLAGS@

+

+# dlopen

+DLOPEN_LIBS = @DLOPEN_LIBS@

+

+# Source selection

+MESA_ASM_SOURCES = @MESA_ASM_SOURCES@

+GLAPI_ASM_SOURCES = @GLAPI_ASM_SOURCES@

+

+# Misc tools and flags

+MAKE = @MAKE@

+SHELL = @SHELL@

+MKLIB_OPTIONS = @MKLIB_OPTIONS@

+MKDEP = @MKDEP@

+MKDEP_OPTIONS = @MKDEP_OPTIONS@

+INSTALL = @INSTALL@

+

+# Python and flags (generally only needed by the developers)

+PYTHON2 = @PYTHON2@

+PYTHON_FLAGS = -t -O -O

+

+# Library names (base name)

+GL_LIB = GL

+GLU_LIB = GLU

+GLUT_LIB = glut

+GLW_LIB = GLw

+OSMESA_LIB = @OSMESA_LIB@

+GLESv1_CM_LIB = GLESv1_CM

+GLESv2_LIB = GLESv2

+VG_LIB = OpenVG

+

+# Library names (actual file names)

+GL_LIB_NAME = @GL_LIB_NAME@

+GLU_LIB_NAME = @GLU_LIB_NAME@

+GLUT_LIB_NAME = @GLUT_LIB_NAME@

+GLW_LIB_NAME = @GLW_LIB_NAME@

+OSMESA_LIB_NAME = @OSMESA_LIB_NAME@

+EGL_LIB_NAME = @EGL_LIB_NAME@

+GLESv1_CM_LIB_NAME = @GLESv1_CM_LIB_NAME@

+GLESv2_LIB_NAME = @GLESv2_LIB_NAME@

+VG_LIB_NAME = @VG_LIB_NAME@

+

+# Globs used to install the lib and all symlinks

+GL_LIB_GLOB = @GL_LIB_GLOB@

+GLU_LIB_GLOB = @GLU_LIB_GLOB@

+GLUT_LIB_GLOB = @GLUT_LIB_GLOB@

+GLW_LIB_GLOB = @GLW_LIB_GLOB@

+OSMESA_LIB_GLOB = @OSMESA_LIB_GLOB@

+EGL_LIB_GLOB = @EGL_LIB_GLOB@

+GLESv1_CM_LIB_GLOB = @GLESv1_CM_LIB_GLOB@

+GLESv2_LIB_GLOB = @GLESv2_LIB_GLOB@

+VG_LIB_GLOB = @VG_LIB_GLOB@

+

+# Directories to build

+LIB_DIR = @LIB_DIR@

+SRC_DIRS = @SRC_DIRS@

+GLU_DIRS = @GLU_DIRS@

+DRIVER_DIRS = @DRIVER_DIRS@

+EGL_DRIVERS_DIRS = @EGL_DRIVERS_DIRS@

+GALLIUM_DIRS = @GALLIUM_DIRS@

+GALLIUM_DRIVERS_DIRS = @GALLIUM_DRIVERS_DIRS@

+GALLIUM_WINSYS_DIRS = @GALLIUM_WINSYS_DIRS@

+GALLIUM_TARGET_DIRS = @GALLIUM_TARGET_DIRS@

+GALLIUM_STATE_TRACKERS_DIRS = @GALLIUM_STATE_TRACKERS_DIRS@

+GALLIUM_AUXILIARIES = $(TOP)/src/gallium/auxiliary/libgallium.a

+GALLIUM_DRIVERS = $(foreach DIR,$(GALLIUM_DRIVERS_DIRS),$(TOP)/src/gallium/drivers/$(DIR)/lib$(DIR).a)

+

+# Driver specific build vars

+DRI_DIRS = @DRI_DIRS@ 

+EGL_PLATFORMS = @EGL_PLATFORMS@

+EGL_CLIENT_APIS = @EGL_CLIENT_APIS@

+

+# Dependencies

+X11_INCLUDES = @X11_INCLUDES@

+

+# GLw motif setup

+GLW_SOURCES = @GLW_SOURCES@

+MOTIF_CFLAGS = @MOTIF_CFLAGS@

+

+# Library/program dependencies

+GL_LIB_DEPS = $(EXTRA_LIB_PATH) @GL_LIB_DEPS@

+OSMESA_LIB_DEPS = -L$(TOP)/$(LIB_DIR) @OSMESA_MESA_DEPS@ \

+	$(EXTRA_LIB_PATH) @OSMESA_LIB_DEPS@

+EGL_LIB_DEPS = $(EXTRA_LIB_PATH) @EGL_LIB_DEPS@

+GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) @GLU_MESA_DEPS@ \

+	$(EXTRA_LIB_PATH) @GLU_LIB_DEPS@

+GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) @GLUT_MESA_DEPS@ \

+	$(EXTRA_LIB_PATH) @GLUT_LIB_DEPS@

+GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) @GLW_MESA_DEPS@ \

+	$(EXTRA_LIB_PATH) @GLW_LIB_DEPS@

+APP_LIB_DEPS = $(EXTRA_LIB_PATH) @APP_LIB_DEPS@

+GLESv1_CM_LIB_DEPS = $(EXTRA_LIB_PATH) @GLESv1_CM_LIB_DEPS@

+GLESv2_LIB_DEPS = $(EXTRA_LIB_PATH) @GLESv2_LIB_DEPS@

+VG_LIB_DEPS = $(EXTRA_LIB_PATH) @VG_LIB_DEPS@

+

+# DRI dependencies

+DRI_LIB_DEPS = $(EXTRA_LIB_PATH) @DRI_LIB_DEPS@

+LIBDRM_CFLAGS = @LIBDRM_CFLAGS@

+LIBDRM_LIB = @LIBDRM_LIBS@

+DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@

+EXPAT_INCLUDES = @EXPAT_INCLUDES@

+

+# Autoconf directories

+prefix = @prefix@

+exec_prefix = @exec_prefix@

+libdir = @libdir@

+includedir = @includedir@

+

+# Installation directories (for make install)

+INSTALL_DIR = $(prefix)

+INSTALL_LIB_DIR = $(libdir)

+INSTALL_INC_DIR = $(includedir)

+

+# DRI installation directories

+DRI_DRIVER_INSTALL_DIR = @DRI_DRIVER_INSTALL_DIR@

+

+# Where libGL will look for DRI hardware drivers

+DRI_DRIVER_SEARCH_DIR = @DRI_DRIVER_SEARCH_DIR@

+

+# EGL driver install directory

+EGL_DRIVER_INSTALL_DIR = @EGL_DRIVER_INSTALL_DIR@

+

+# Xorg driver install directory (for xorg state-tracker)

+XORG_DRIVER_INSTALL_DIR = @XORG_DRIVER_INSTALL_DIR@

+

+# pkg-config substitutions

+GL_PC_REQ_PRIV = @GL_PC_REQ_PRIV@

+GL_PC_LIB_PRIV = @GL_PC_LIB_PRIV@

+GL_PC_CFLAGS = @GL_PC_CFLAGS@

+DRI_PC_REQ_PRIV = @DRI_PC_REQ_PRIV@

+GLU_PC_REQ = @GLU_PC_REQ@

+GLU_PC_REQ_PRIV = @GLU_PC_REQ_PRIV@

+GLU_PC_LIB_PRIV = @GLU_PC_LIB_PRIV@

+GLU_PC_CFLAGS = @GLU_PC_CFLAGS@

+GLUT_PC_REQ_PRIV = @GLUT_PC_REQ_PRIV@

+GLUT_PC_LIB_PRIV = @GLUT_PC_LIB_PRIV@

+GLUT_PC_CFLAGS = @GLUT_PC_CFLAGS@

+GLW_PC_REQ_PRIV = @GLW_PC_REQ_PRIV@

+GLW_PC_LIB_PRIV = @GLW_PC_LIB_PRIV@

+GLW_PC_CFLAGS = @GLW_PC_CFLAGS@

+OSMESA_PC_REQ = @OSMESA_PC_REQ@

+OSMESA_PC_LIB_PRIV = @OSMESA_PC_LIB_PRIV@

+GLESv1_CM_PC_LIB_PRIV = @GLESv1_CM_PC_LIB_PRIV@

+GLESv2_PC_LIB_PRIV = @GLESv2_PC_LIB_PRIV@

+EGL_PC_REQ_PRIV = @GL_PC_REQ_PRIV@

+EGL_PC_LIB_PRIV = @GL_PC_LIB_PRIV@

+EGL_PC_CFLAGS = @GL_PC_CFLAGS@

+

+XCB_DRI2_CFLAGS = @XCB_DRI2_CFLAGS@

+XCB_DRI2_LIBS = @XCB_DRI2_LIBS@

+LIBUDEV_CFLAGS = @LIBUDEV_CFLAGS@

+LIBUDEV_LIBS = @LIBUDEV_LIBS@

+

+MESA_LLVM = @MESA_LLVM@

+

+LLVM_VERSION = @LLVM_VERSION@

+ifneq ($(LLVM_VERSION),)

+  HAVE_LLVM := 0x0$(subst .,0,$(LLVM_VERSION:svn=))

+  DEFINES += -DHAVE_LLVM=$(HAVE_LLVM)

+endif

+

+HAVE_XF86VIDMODE = @HAVE_XF86VIDMODE@

diff --git a/mesalib/configs/default b/mesalib/configs/default
index f2aedefc0..b4532f931 100644
--- a/mesalib/configs/default
+++ b/mesalib/configs/default
@@ -1,179 +1,179 @@
-# Default/template configuration
-
-# This is included by other config files which may override some
-# of these variables.
-# Think of this as a base class from which configs are derived.
-
-
-CONFIG_NAME = default
-
-# Version info
-MESA_MAJOR=7
-MESA_MINOR=9
-MESA_TINY=0
-MESA_VERSION = $(MESA_MAJOR).$(MESA_MINOR).$(MESA_TINY)
-
-# external projects.  This should be useless now that we use libdrm.
-DRM_SOURCE_PATH=$(TOP)/../drm
-
-# Compiler and flags
-CC = cc
-CXX = CC
-HOST_CC = $(CC)
-CFLAGS = -O
-CXXFLAGS = -O
-LDFLAGS =
-HOST_CFLAGS = $(CFLAGS)
-GLU_CFLAGS = 
-
-# Compiler for building demos/tests/etc
-APP_CC = $(CC)
-APP_CXX = $(CXX)
-
-# Misc tools and flags
-SHELL = /bin/sh
-MKLIB = $(SHELL) $(TOP)/bin/mklib
-MKLIB_OPTIONS = 
-MKDEP = makedepend
-MKDEP_OPTIONS = -fdepend
-MAKE = make
-
-# Use MINSTALL for installing libraries, INSTALL for everything else
-MINSTALL = $(SHELL) $(TOP)/bin/minstall
-INSTALL = $(MINSTALL)
-
-# Tools for regenerating glapi (generally only needed by the developers)
-PYTHON2 = python
-PYTHON_FLAGS = -t -O -O
-INDENT = indent
-INDENT_FLAGS = -i4 -nut -br -brs -npcs -ce -T GLubyte -T GLbyte -T Bool
-
-# Library names (base name)
-GL_LIB = GL
-GLU_LIB = GLU
-GLUT_LIB = glut
-GLW_LIB = GLw
-OSMESA_LIB = OSMesa
-EGL_LIB = EGL
-GLESv1_CM_LIB = GLESv1_CM
-GLESv2_LIB = GLESv2
-VG_LIB = OpenVG
-
-
-# Library names (actual file names)
-GL_LIB_NAME = lib$(GL_LIB).so
-GLU_LIB_NAME = lib$(GLU_LIB).so
-GLUT_LIB_NAME = lib$(GLUT_LIB).so
-GLW_LIB_NAME = lib$(GLW_LIB).so
-OSMESA_LIB_NAME = lib$(OSMESA_LIB).so
-EGL_LIB_NAME = lib$(EGL_LIB).so
-GLESv1_CM_LIB_NAME = lib$(GLESv1_CM_LIB).so
-GLESv2_LIB_NAME = lib$(GLESv2_LIB).so
-VG_LIB_NAME = lib$(VG_LIB).so
-
-# globs used to install the lib and all symlinks
-GL_LIB_GLOB = $(GL_LIB_NAME)*
-GLU_LIB_GLOB = $(GLU_LIB_NAME)*
-GLUT_LIB_GLOB = $(GLUT_LIB_NAME)*
-GLW_LIB_GLOB = $(GLW_LIB_NAME)*
-OSMESA_LIB_GLOB = $(OSMESA_LIB_NAME)*
-EGL_LIB_GLOB = $(EGL_LIB_NAME)*
-GLESv1_CM_LIB_GLOB = $(GLESv1_CM_LIB_NAME)*
-GLESv2_LIB_GLOB = $(GLESv2_LIB_NAME)*
-VG_LIB_GLOB = $(VG_LIB_NAME)*
-
-TALLOC_LIBS = `pkg-config --libs talloc`
-TALLOC_CFLAGS = `pkg-config --cflags talloc`
-
-# Optional assembly language optimization files for libGL
-MESA_ASM_SOURCES = 
-
-# GLw widget sources (Append "GLwMDrawA.c" here and add -lXm to GLW_LIB_DEPS in
-# order to build the Motif widget too)
-GLW_SOURCES = GLwDrawA.c
-MOTIF_CFLAGS = -I/usr/include/Motif1.2
-
-
-# Directories to build
-LIB_DIR = lib
-SRC_DIRS = glsl mapi/glapi mapi/vgapi mesa \
-	gallium egl gallium/winsys gallium/targets glu glut/glx glw
-GLU_DIRS = sgi
-DRIVER_DIRS = x11 osmesa
-
-# EGL drivers to build
-EGL_DRIVERS_DIRS = glx
-
-# Gallium directories and 
-GALLIUM_DIRS = auxiliary drivers state_trackers
-GALLIUM_AUXILIARIES = $(TOP)/src/gallium/auxiliary/libgallium.a
-GALLIUM_DRIVERS_DIRS = softpipe trace rbug identity galahad i915 i965 svga r300 nvfx nv50 failover
-GALLIUM_DRIVERS = $(foreach DIR,$(GALLIUM_DRIVERS_DIRS),$(TOP)/src/gallium/drivers/$(DIR)/lib$(DIR).a)
-GALLIUM_WINSYS_DIRS = sw sw/xlib
-GALLIUM_TARGET_DIRS = libgl-xlib
-GALLIUM_STATE_TRACKERS_DIRS = glx vega
-
-# native platforms EGL should support
-EGL_PLATFORMS = x11
-EGL_CLIENT_APIS = $(GL_LIB)
-
-# Library dependencies
-#EXTRA_LIB_PATH ?=
-GL_LIB_DEPS     = $(EXTRA_LIB_PATH) -lX11 -lXext -lm -lpthread $(TALLOC_LIBS)
-EGL_LIB_DEPS    = $(EXTRA_LIB_PATH) -ldl -lpthread
-OSMESA_LIB_DEPS = $(EXTRA_LIB_PATH) -L$(TOP)/$(LIB_DIR) -l$(GL_LIB)
-GLU_LIB_DEPS    = $(EXTRA_LIB_PATH) -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -lm
-GLUT_LIB_DEPS   = $(EXTRA_LIB_PATH) -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -lX11 -lXmu -lXi -lm
-GLW_LIB_DEPS    = $(EXTRA_LIB_PATH) -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -lXt -lX11
-APP_LIB_DEPS    = $(EXTRA_LIB_PATH) -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm
-GLESv1_CM_LIB_DEPS = $(EXTRA_LIB_PATH) -lpthread
-GLESv2_LIB_DEPS = $(EXTRA_LIB_PATH) -lpthread
-VG_LIB_DEPS    = $(EXTRA_LIB_PATH) -lpthread
-
-# Program dependencies - specific GL/glut libraries added in Makefiles
-APP_LIB_DEPS = -lm
-X11_LIBS = -lX11
-
-DLOPEN_LIBS = -ldl
-
-# Installation directories (for make install)
-INSTALL_DIR = /usr/local
-INSTALL_LIB_DIR = $(INSTALL_DIR)/$(LIB_DIR)
-INSTALL_INC_DIR = $(INSTALL_DIR)/include
-DRI_DRIVER_INSTALL_DIR = $(INSTALL_LIB_DIR)/dri
-
-# Where libGL will look for DRI hardware drivers
-DRI_DRIVER_SEARCH_DIR = $(DRI_DRIVER_INSTALL_DIR)
-
-# EGL driver install directory
-EGL_DRIVER_INSTALL_DIR = $(INSTALL_LIB_DIR)/egl
-
-# Xorg driver install directory (for xorg state-tracker)
-XORG_DRIVER_INSTALL_DIR = $(INSTALL_LIB_DIR)/xorg/modules/drivers
-
-# pkg-config substitutions
-GL_PC_REQ_PRIV =
-GL_PC_LIB_PRIV =
-GL_PC_CFLAGS =
-DRI_PC_REQ_PRIV =
-GLU_PC_REQ = gl
-GLU_PC_REQ_PRIV =
-GLU_PC_LIB_PRIV =
-GLU_PC_CFLAGS =
-GLUT_PC_REQ_PRIV =
-GLUT_PC_LIB_PRIV =
-GLUT_PC_CFLAGS =
-GLW_PC_REQ_PRIV =
-GLW_PC_LIB_PRIV =
-GLW_PC_CFLAGS =
-OSMESA_PC_REQ =
-OSMESA_PC_LIB_PRIV =
-GLESv1_CM_PC_REQ_PRIV =
-GLESv1_CM_PC_LIB_PRIV =
-GLESv1_CM_PC_CFLAGS =
-GLESv2_PC_REQ_PRIV =
-GLESv2_PC_LIB_PRIV =
-GLESv2_PC_CFLAGS =
-VG_PC_REQ_PRIV =
-VG_PC_LIB_PRIV =
-VG_PC_CFLAGS =
+# Default/template configuration

+

+# This is included by other config files which may override some

+# of these variables.

+# Think of this as a base class from which configs are derived.

+

+

+CONFIG_NAME = default

+

+# Version info

+MESA_MAJOR=7

+MESA_MINOR=10

+MESA_TINY=0

+MESA_VERSION = $(MESA_MAJOR).$(MESA_MINOR).$(MESA_TINY)

+

+# external projects.  This should be useless now that we use libdrm.

+DRM_SOURCE_PATH=$(TOP)/../drm

+

+# Compiler and flags

+CC = cc

+CXX = CC

+HOST_CC = $(CC)

+CFLAGS = -O

+CXXFLAGS = -O

+LDFLAGS =

+HOST_CFLAGS = $(CFLAGS)

+GLU_CFLAGS = 

+

+# Compiler for building demos/tests/etc

+APP_CC = $(CC)

+APP_CXX = $(CXX)

+

+# Misc tools and flags

+SHELL = /bin/sh

+MKLIB = $(SHELL) $(TOP)/bin/mklib

+MKLIB_OPTIONS = 

+MKDEP = makedepend

+MKDEP_OPTIONS = -fdepend

+MAKE = make

+

+# Use MINSTALL for installing libraries, INSTALL for everything else

+MINSTALL = $(SHELL) $(TOP)/bin/minstall

+INSTALL = $(MINSTALL)

+

+# Tools for regenerating glapi (generally only needed by the developers)

+PYTHON2 = python

+PYTHON_FLAGS = -t -O -O

+INDENT = indent

+INDENT_FLAGS = -i4 -nut -br -brs -npcs -ce -T GLubyte -T GLbyte -T Bool

+

+# Library names (base name)

+GL_LIB = GL

+GLU_LIB = GLU

+GLUT_LIB = glut

+GLW_LIB = GLw

+OSMESA_LIB = OSMesa

+EGL_LIB = EGL

+GLESv1_CM_LIB = GLESv1_CM

+GLESv2_LIB = GLESv2

+VG_LIB = OpenVG

+

+

+# Library names (actual file names)

+GL_LIB_NAME = lib$(GL_LIB).so

+GLU_LIB_NAME = lib$(GLU_LIB).so

+GLUT_LIB_NAME = lib$(GLUT_LIB).so

+GLW_LIB_NAME = lib$(GLW_LIB).so

+OSMESA_LIB_NAME = lib$(OSMESA_LIB).so

+EGL_LIB_NAME = lib$(EGL_LIB).so

+GLESv1_CM_LIB_NAME = lib$(GLESv1_CM_LIB).so

+GLESv2_LIB_NAME = lib$(GLESv2_LIB).so

+VG_LIB_NAME = lib$(VG_LIB).so

+

+# globs used to install the lib and all symlinks

+GL_LIB_GLOB = $(GL_LIB_NAME)*

+GLU_LIB_GLOB = $(GLU_LIB_NAME)*

+GLUT_LIB_GLOB = $(GLUT_LIB_NAME)*

+GLW_LIB_GLOB = $(GLW_LIB_NAME)*

+OSMESA_LIB_GLOB = $(OSMESA_LIB_NAME)*

+EGL_LIB_GLOB = $(EGL_LIB_NAME)*

+GLESv1_CM_LIB_GLOB = $(GLESv1_CM_LIB_NAME)*

+GLESv2_LIB_GLOB = $(GLESv2_LIB_NAME)*

+VG_LIB_GLOB = $(VG_LIB_NAME)*

+

+TALLOC_LIBS = `pkg-config --libs talloc`

+TALLOC_CFLAGS = `pkg-config --cflags talloc`

+

+# Optional assembly language optimization files for libGL

+MESA_ASM_SOURCES = 

+

+# GLw widget sources (Append "GLwMDrawA.c" here and add -lXm to GLW_LIB_DEPS in

+# order to build the Motif widget too)

+GLW_SOURCES = GLwDrawA.c

+MOTIF_CFLAGS = -I/usr/include/Motif1.2

+

+

+# Directories to build

+LIB_DIR = lib

+SRC_DIRS = glsl mapi/glapi mapi/vgapi mesa \

+	gallium egl gallium/winsys gallium/targets glu glut/glx glw

+GLU_DIRS = sgi

+DRIVER_DIRS = x11 osmesa

+

+# EGL drivers to build

+EGL_DRIVERS_DIRS = glx

+

+# Gallium directories and 

+GALLIUM_DIRS = auxiliary drivers state_trackers

+GALLIUM_AUXILIARIES = $(TOP)/src/gallium/auxiliary/libgallium.a

+GALLIUM_DRIVERS_DIRS = softpipe trace rbug identity galahad i915 i965 svga r300 nvfx nv50 failover

+GALLIUM_DRIVERS = $(foreach DIR,$(GALLIUM_DRIVERS_DIRS),$(TOP)/src/gallium/drivers/$(DIR)/lib$(DIR).a)

+GALLIUM_WINSYS_DIRS = sw sw/xlib

+GALLIUM_TARGET_DIRS = libgl-xlib

+GALLIUM_STATE_TRACKERS_DIRS = glx vega

+

+# native platforms EGL should support

+EGL_PLATFORMS = x11

+EGL_CLIENT_APIS = $(GL_LIB)

+

+# Library dependencies

+#EXTRA_LIB_PATH ?=

+GL_LIB_DEPS     = $(EXTRA_LIB_PATH) -lX11 -lXext -lm -lpthread $(TALLOC_LIBS)

+EGL_LIB_DEPS    = $(EXTRA_LIB_PATH) -ldl -lpthread

+OSMESA_LIB_DEPS = $(EXTRA_LIB_PATH) -L$(TOP)/$(LIB_DIR) -l$(GL_LIB)

+GLU_LIB_DEPS    = $(EXTRA_LIB_PATH) -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -lm

+GLUT_LIB_DEPS   = $(EXTRA_LIB_PATH) -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -lX11 -lXmu -lXi -lm

+GLW_LIB_DEPS    = $(EXTRA_LIB_PATH) -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -lXt -lX11

+APP_LIB_DEPS    = $(EXTRA_LIB_PATH) -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm

+GLESv1_CM_LIB_DEPS = $(EXTRA_LIB_PATH) -lpthread

+GLESv2_LIB_DEPS = $(EXTRA_LIB_PATH) -lpthread

+VG_LIB_DEPS    = $(EXTRA_LIB_PATH) -lpthread

+

+# Program dependencies - specific GL/glut libraries added in Makefiles

+APP_LIB_DEPS = -lm

+X11_LIBS = -lX11

+

+DLOPEN_LIBS = -ldl

+

+# Installation directories (for make install)

+INSTALL_DIR = /usr/local

+INSTALL_LIB_DIR = $(INSTALL_DIR)/$(LIB_DIR)

+INSTALL_INC_DIR = $(INSTALL_DIR)/include

+DRI_DRIVER_INSTALL_DIR = $(INSTALL_LIB_DIR)/dri

+

+# Where libGL will look for DRI hardware drivers

+DRI_DRIVER_SEARCH_DIR = $(DRI_DRIVER_INSTALL_DIR)

+

+# EGL driver install directory

+EGL_DRIVER_INSTALL_DIR = $(INSTALL_LIB_DIR)/egl

+

+# Xorg driver install directory (for xorg state-tracker)

+XORG_DRIVER_INSTALL_DIR = $(INSTALL_LIB_DIR)/xorg/modules/drivers

+

+# pkg-config substitutions

+GL_PC_REQ_PRIV =

+GL_PC_LIB_PRIV =

+GL_PC_CFLAGS =

+DRI_PC_REQ_PRIV =

+GLU_PC_REQ = gl

+GLU_PC_REQ_PRIV =

+GLU_PC_LIB_PRIV =

+GLU_PC_CFLAGS =

+GLUT_PC_REQ_PRIV =

+GLUT_PC_LIB_PRIV =

+GLUT_PC_CFLAGS =

+GLW_PC_REQ_PRIV =

+GLW_PC_LIB_PRIV =

+GLW_PC_CFLAGS =

+OSMESA_PC_REQ =

+OSMESA_PC_LIB_PRIV =

+GLESv1_CM_PC_REQ_PRIV =

+GLESv1_CM_PC_LIB_PRIV =

+GLESv1_CM_PC_CFLAGS =

+GLESv2_PC_REQ_PRIV =

+GLESv2_PC_LIB_PRIV =

+GLESv2_PC_CFLAGS =

+VG_PC_REQ_PRIV =

+VG_PC_LIB_PRIV =

+VG_PC_CFLAGS =

diff --git a/mesalib/configs/linux-dri b/mesalib/configs/linux-dri
index 6f86277c4..5e3593787 100644
--- a/mesalib/configs/linux-dri
+++ b/mesalib/configs/linux-dri
@@ -1,71 +1,71 @@
-# -*-makefile-*-
-# Configuration for linux-dri: Linux DRI hardware drivers for XFree86 & others
-
-include $(TOP)/configs/default
-
-CONFIG_NAME = linux-dri
-
-# Compiler and flags
-CC = gcc
-CXX = g++
-
-#MKDEP = /usr/X11R6/bin/makedepend
-#MKDEP = gcc -M
-#MKDEP_OPTIONS = -MF depend
-
-OPT_FLAGS  = -O2 -g
-PIC_FLAGS  = -fPIC
-
-# Add '-DGLX_USE_TLS' to ARCH_FLAGS to enable TLS support.
-ARCH_FLAGS ?=
-
-DEFINES = -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE \
-	-D_BSD_SOURCE -D_GNU_SOURCE \
-	-DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER \
-	-DGLX_DIRECT_RENDERING -DGLX_INDIRECT_RENDERING \
-	-DHAVE_ALIAS -DHAVE_POSIX_MEMALIGN
-
-X11_INCLUDES = -I/usr/X11R6/include
-
-CFLAGS = -Wall -Wmissing-prototypes -std=c99 -ffast-math \
-	$(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES) $(ASM_FLAGS)
-
-CXXFLAGS = -Wall $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES)
-
-GLUT_CFLAGS = -fexceptions
-
-# Work around aliasing bugs - developers should comment this out
-CFLAGS += -fno-strict-aliasing
-CXXFLAGS += -fno-strict-aliasing
-
-MESA_ASM_SOURCES = 
-
-# Library/program dependencies
-EXTRA_LIB_PATH=-L/usr/X11R6/lib
-
-LIBDRM_CFLAGS = $(shell pkg-config --cflags libdrm)
-LIBDRM_LIB = $(shell pkg-config --libs libdrm)
-DRI_LIB_DEPS  = $(EXTRA_LIB_PATH) -lm -lpthread -lexpat -ldl -ltalloc $(LIBDRM_LIB)
-GL_LIB_DEPS   = $(EXTRA_LIB_PATH) -lX11 -lXext -lXxf86vm -lXdamage -lXfixes \
-		-lm -lpthread -ldl $(LIBDRM_LIB)
-
-
-# Directories
-SRC_DIRS := glx egl $(SRC_DIRS)
-
-# EGL directories
-EGL_DRIVERS_DIRS = glx
-
-DRIVER_DIRS = dri
-GALLIUM_WINSYS_DIRS = sw sw/xlib drm/vmware drm/intel drm/i965
-GALLIUM_TARGET_DIRS = egl-swrast
-GALLIUM_STATE_TRACKERS_DIRS = egl
-
-DRI_DIRS = i810 i915 i965 mach64 mga r128 r200 r300 radeon \
-	savage sis tdfx unichrome swrast
-
-INTEL_LIBS = `pkg-config --libs libdrm_intel`
-INTEL_CFLAGS = `pkg-config --cflags libdrm_intel`
-
-RADEON_LIBS = `pkg-config --libs libdrm_radeon`
-RADEON_CFLAGS = `pkg-config --cflags libdrm_radeon`
+# -*-makefile-*-

+# Configuration for linux-dri: Linux DRI hardware drivers for XFree86 & others

+

+include $(TOP)/configs/default

+

+CONFIG_NAME = linux-dri

+

+# Compiler and flags

+CC = gcc

+CXX = g++

+

+#MKDEP = /usr/X11R6/bin/makedepend

+#MKDEP = gcc -M

+#MKDEP_OPTIONS = -MF depend

+

+OPT_FLAGS  = -O2 -g

+PIC_FLAGS  = -fPIC

+

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

+ARCH_FLAGS ?=

+

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

+	-D_BSD_SOURCE -D_GNU_SOURCE \

+	-DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER \

+	-DGLX_DIRECT_RENDERING -DGLX_INDIRECT_RENDERING \

+	-DHAVE_ALIAS -DHAVE_POSIX_MEMALIGN

+

+X11_INCLUDES = -I/usr/X11R6/include

+

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

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

+

+CXXFLAGS = -Wall $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES)

+

+GLUT_CFLAGS = -fexceptions

+

+# Work around aliasing bugs - developers should comment this out

+CFLAGS += -fno-strict-aliasing

+CXXFLAGS += -fno-strict-aliasing

+

+MESA_ASM_SOURCES = 

+

+# Library/program dependencies

+EXTRA_LIB_PATH=-L/usr/X11R6/lib

+

+LIBDRM_CFLAGS = $(shell pkg-config --cflags libdrm)

+LIBDRM_LIB = $(shell pkg-config --libs libdrm)

+DRI_LIB_DEPS  = $(EXTRA_LIB_PATH) -lm -lpthread -lexpat -ldl -ltalloc $(LIBDRM_LIB)

+GL_LIB_DEPS   = $(EXTRA_LIB_PATH) -lX11 -lXext -lXxf86vm -lXdamage -lXfixes \

+		-lm -lpthread -ldl $(LIBDRM_LIB)

+

+

+# Directories

+SRC_DIRS := glx egl $(SRC_DIRS)

+

+# EGL directories

+EGL_DRIVERS_DIRS = glx

+

+DRIVER_DIRS = dri

+GALLIUM_WINSYS_DIRS = sw sw/xlib drm/vmware drm/intel drm/i965

+GALLIUM_TARGET_DIRS = 

+GALLIUM_STATE_TRACKERS_DIRS = egl

+

+DRI_DIRS = i810 i915 i965 mach64 mga r128 r200 r300 radeon \

+	savage sis tdfx unichrome swrast

+

+INTEL_LIBS = `pkg-config --libs libdrm_intel`

+INTEL_CFLAGS = `pkg-config --cflags libdrm_intel`

+

+RADEON_LIBS = `pkg-config --libs libdrm_radeon`

+RADEON_CFLAGS = `pkg-config --cflags libdrm_radeon`

diff --git a/mesalib/configs/linux-llvm b/mesalib/configs/linux-llvm
index 6aa434032..b43d2cfd0 100644
--- a/mesalib/configs/linux-llvm
+++ b/mesalib/configs/linux-llvm
@@ -1,44 +1,44 @@
-# -*-makefile-*-
-# Configuration for Linux and LLVM with optimizations
-# Builds the llvmpipe gallium driver
-
-include $(TOP)/configs/linux
-
-CONFIG_NAME = linux-llvm
-
-# Add llvmpipe driver
-GALLIUM_DRIVERS_DIRS += llvmpipe
-
-OPT_FLAGS = -O3 -ansi -pedantic
-ARCH_FLAGS = -mmmx -msse -msse2 -mstackrealign
-
-DEFINES += -DNDEBUG -DGALLIUM_LLVMPIPE -DHAVE_UDIS86
-
-# override -std=c99
-CFLAGS += -std=gnu99 -D__STDC_CONSTANT_MACROS
-
-LLVM_VERSION := $(shell llvm-config --version)
-
-ifeq ($(LLVM_VERSION),)
-  $(warning Could not find LLVM! Make Sure 'llvm-config' is in the path)
-  MESA_LLVM=0
-else
-  MESA_LLVM=1
-  HAVE_LLVM := 0x0$(subst .,0,$(LLVM_VERSION:svn=))
-  DEFINES += -DHAVE_LLVM=$(HAVE_LLVM)
-#  $(info Using LLVM version: $(LLVM_VERSION))
-endif
-
-ifeq ($(MESA_LLVM),1)
-#  LLVM_CFLAGS=`llvm-config --cflags`
-  LLVM_CXXFLAGS=`llvm-config --cxxflags backend bitreader engine ipo interpreter instrumentation` -Wno-long-long
-  LLVM_LDFLAGS = $(shell llvm-config --ldflags backend bitreader engine ipo interpreter instrumentation)
-  LLVM_LIBS = $(shell llvm-config --libs backend bitwriter bitreader engine ipo interpreter instrumentation)
-  MKLIB_OPTIONS=-cplusplus
-else
-  LLVM_CFLAGS=
-  LLVM_CXXFLAGS=
-endif
-
-LD = g++
-GL_LIB_DEPS = $(LLVM_LDFLAGS) $(LLVM_LIBS) $(EXTRA_LIB_PATH) -lX11 -lXext -lm -lpthread -ltalloc -lstdc++ -ludis86
+# -*-makefile-*-

+# Configuration for Linux and LLVM with optimizations

+# Builds the llvmpipe gallium driver

+

+include $(TOP)/configs/linux

+

+CONFIG_NAME = linux-llvm

+

+# Add llvmpipe driver

+GALLIUM_DRIVERS_DIRS += llvmpipe

+

+OPT_FLAGS = -O3 -ansi -pedantic

+ARCH_FLAGS = -mmmx -msse -msse2 -mstackrealign

+

+DEFINES += -DNDEBUG -DGALLIUM_LLVMPIPE -DHAVE_UDIS86

+

+# override -std=c99

+CFLAGS += -std=gnu99

+

+LLVM_VERSION := $(shell llvm-config --version)

+

+ifeq ($(LLVM_VERSION),)

+  $(warning Could not find LLVM! Make Sure 'llvm-config' is in the path)

+  MESA_LLVM=0

+else

+  MESA_LLVM=1

+  HAVE_LLVM := 0x0$(subst .,0,$(LLVM_VERSION:svn=))

+  DEFINES += -DHAVE_LLVM=$(HAVE_LLVM)

+#  $(info Using LLVM version: $(LLVM_VERSION))

+endif

+

+ifeq ($(MESA_LLVM),1)

+  LLVM_CFLAGS=`llvm-config --cppflags`

+  LLVM_CXXFLAGS=`llvm-config --cxxflags backend bitreader engine ipo interpreter instrumentation` -Wno-long-long

+  LLVM_LDFLAGS = $(shell llvm-config --ldflags backend bitreader engine ipo interpreter instrumentation)

+  LLVM_LIBS = $(shell llvm-config --libs backend bitwriter bitreader engine ipo interpreter instrumentation)

+  MKLIB_OPTIONS=-cplusplus

+else

+  LLVM_CFLAGS=

+  LLVM_CXXFLAGS=

+endif

+

+LD = g++

+GL_LIB_DEPS = $(LLVM_LDFLAGS) $(LLVM_LIBS) $(EXTRA_LIB_PATH) -lX11 -lXext -lm -lpthread -ltalloc -lstdc++ -ludis86