From 6ce4a85e0b1d6581d73c1b1cbc37525d7a9ed1ba Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Fri, 5 Mar 2010 17:35:01 -0700
Subject: mesa: bump version to 7.9

Now that the 7.8 branch has been created Mesa/master will be version 7.9
---
 configs/default | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'configs')

diff --git a/configs/default b/configs/default
index ad6d93c92ff..4fe64cc6c95 100644
--- a/configs/default
+++ b/configs/default
@@ -9,7 +9,7 @@ CONFIG_NAME = default
 
 # Version info
 MESA_MAJOR=7
-MESA_MINOR=8
+MESA_MINOR=9
 MESA_TINY=0
 MESA_VERSION = $(MESA_MAJOR).$(MESA_MINOR).$(MESA_TINY)
 
-- 
cgit v1.2.3


From 9009a854d1e0a8682af50b34650e0de62f5fe3a3 Mon Sep 17 00:00:00 2001
From: George Sapountzis <gsapountzis@gmail.com>
Date: Sat, 6 Mar 2010 06:33:20 +0200
Subject: config: drop WINDOW_SYSTEM var

---
 configs/autoconf.in    | 1 -
 configs/freebsd-dri    | 1 -
 configs/linux-dri      | 1 -
 configs/linux-dri-xcb  | 2 --
 configs/linux-egl      | 1 -
 configs/linux-indirect | 1 -
 configure.ac           | 3 ---
 7 files changed, 10 deletions(-)

(limited to 'configs')

diff --git a/configs/autoconf.in b/configs/autoconf.in
index 30637877f3b..510d658b119 100644
--- a/configs/autoconf.in
+++ b/configs/autoconf.in
@@ -83,7 +83,6 @@ PROGRAM_DIRS = @PROGRAM_DIRS@
 
 # Driver specific build vars
 DRI_DIRS = @DRI_DIRS@ 
-WINDOW_SYSTEM = @WINDOW_SYSTEM@
 EGL_DISPLAYS = @EGL_DISPLAYS@
 
 # Dependencies
diff --git a/configs/freebsd-dri b/configs/freebsd-dri
index 0b91cfc37e9..2c697e1c6e4 100644
--- a/configs/freebsd-dri
+++ b/configs/freebsd-dri
@@ -44,7 +44,6 @@ GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -L/usr/local/lib -lGL -lXt -lX11
 SRC_DIRS = glx gallium mesa glu glut/glx glew glw
 DRIVER_DIRS = dri
 PROGRAM_DIRS = 
-WINDOW_SYSTEM=dri
 
 DRM_SOURCE_PATH=$(TOP)/../drm
 
diff --git a/configs/linux-dri b/configs/linux-dri
index e8e8ccfcf94..b75273946da 100644
--- a/configs/linux-dri
+++ b/configs/linux-dri
@@ -58,7 +58,6 @@ PROGRAM_DIRS := egl $(PROGRAM_DIRS)
 EGL_DRIVERS_DIRS = glx
 
 DRIVER_DIRS = dri
-WINDOW_SYSTEM = dri
 GALLIUM_WINSYS_DIRS = drm
 GALLIUM_WINSYS_DRM_DIRS = vmware intel i965
 GALLIUM_STATE_TRACKERS_DIRS = egl
diff --git a/configs/linux-dri-xcb b/configs/linux-dri-xcb
index c5ed89c4b34..1ed980aa36e 100644
--- a/configs/linux-dri-xcb
+++ b/configs/linux-dri-xcb
@@ -51,7 +51,5 @@ SRC_DIRS = glx gallium mesa glu glut/glx glew glw
 PROGRAM_DIRS = xdemos
 
 DRIVER_DIRS = dri
-WINDOW_SYSTEM=dri
-
 DRI_DIRS = i810 i915 mach64 mga r128 r200 r300 radeon \
 	savage sis tdfx unichrome
diff --git a/configs/linux-egl b/configs/linux-egl
index 2c2834b81d7..a8910018fce 100644
--- a/configs/linux-egl
+++ b/configs/linux-egl
@@ -51,7 +51,6 @@ SRC_DIRS = gallium mesa gallium/winsys glu egl
 PROGRAM_DIRS = egl
 
 DRIVER_DIRS = dri
-WINDOW_SYSTEM = dri
 GALLIUM_WINSYS_DIRS = egl_drm
 
 DRI_DIRS = intel 
diff --git a/configs/linux-indirect b/configs/linux-indirect
index 0914fba19bc..1c7dd857db6 100644
--- a/configs/linux-indirect
+++ b/configs/linux-indirect
@@ -50,4 +50,3 @@ GL_LIB_DEPS   = $(EXTRA_LIB_PATH) -lX11 -lXext -lXxf86vm -lm -lpthread -ldl
 SRC_DIRS = glx glu glut/glx glew glw
 DRIVER_DIRS =
 PROGRAM_DIRS = 
-WINDOW_SYSTEM=dri
diff --git a/configure.ac b/configure.ac
index 8ca274932cc..70e158f5d7a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -457,7 +457,6 @@ CORE_DIRS="glsl mesa"
 
 SRC_DIRS="glew"
 GLU_DIRS="sgi"
-WINDOW_SYSTEM=""
 GALLIUM_DIRS="auxiliary drivers state_trackers"
 GALLIUM_WINSYS_DIRS=""
 GALLIUM_WINSYS_DRM_DIRS=""
@@ -472,7 +471,6 @@ xlib)
 dri)
     SRC_DIRS="$SRC_DIRS glx"
     DRIVER_DIRS="dri"
-    WINDOW_SYSTEM="dri"
     GALLIUM_WINSYS_DIRS="$GALLIUM_WINSYS_DIRS drm"
     ;;
 osmesa)
@@ -482,7 +480,6 @@ esac
 AC_SUBST([SRC_DIRS])
 AC_SUBST([GLU_DIRS])
 AC_SUBST([DRIVER_DIRS])
-AC_SUBST([WINDOW_SYSTEM])
 AC_SUBST([GALLIUM_DIRS])
 AC_SUBST([GALLIUM_WINSYS_DIRS])
 AC_SUBST([GALLIUM_WINSYS_DRM_DIRS])
-- 
cgit v1.2.3