From 710d8a697c6050f5a75313006aaad65f0272fc19 Mon Sep 17 00:00:00 2001
From: Michael Olbrich <m.olbrich@pengutronix.de>
Date: Tue, 25 Jan 2011 10:24:14 +0100
Subject: mesalib: cleanup configure options

Don't autodetect which state trackers should be compiled.
This fixes a compile error on ARM when mesalib is rebuilt after
building xorg-server.

Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
---
 rules/mesalib.make | 40 ++++++++++++++++++++--------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/rules/mesalib.make b/rules/mesalib.make
index 54cac0d07..a78f17b39 100644
--- a/rules/mesalib.make
+++ b/rules/mesalib.make
@@ -97,6 +97,11 @@ MESALIB_DRI_DRIVERS-$(PTXCONF_MESALIB_DRI_TRIDENT)	+= trident
 MESALIB_DRI_DRIVERS-$(PTXCONF_MESALIB_DRI_UNICHROME)	+= unichrome
 MESALIB_DRI_DRIVERS-$(PTXCONF_MESALIB_DRI_FFB)		+= ffb
 
+MESALIB_STATE_TRACKERS-$(PTXCONF_MESALIB_DRIVER_XLIB)	+= glx
+MESALIB_STATE_TRACKERS-$(PTXCONF_MESALIB_DRIVER_DRI)	+= dri
+# circular dependency with xorg
+#MESALIB_STATE_TRACKERS-$(PTXCONF_MESALIB_DRIVER_DRI)	+= xorg
+
 MESALIB_AUTOCONF   := \
 	$(CROSS_AUTOCONF_USR) \
 	--disable-static \
@@ -119,42 +124,37 @@ MESALIB_AUTOCONF   := \
 # the 32/64 bit options result in CFLAGS -> -m32 and -m64 which seem
 # only to be available on x86
 
-ifdef PTXCONF_ARCH_X86
-MESALIB_AUTOCONF += \
-	--enable-32-bit \
-	--disable-64-bit
-
 ifdef PTXCONF_MESALIB_DRI_GALLIUM
 MESALIB_AUTOCONF += \
-        --enable-gallium
+	--enable-gallium \
+	--with-state-trackers=$(subst $(space),$(comma),$(MESALIB_STATE_TRACKERS-y))
 else
 MESALIB_AUTOCONF += \
-        --disable-gallium
+	--disable-gallium \
+	--without-state-trackers
 endif
 
-ifdef PTXCONF_MESALIB_DRI_INTEL_GALLIUM
+ifdef PTXCONF_ARCH_X86
 MESALIB_AUTOCONF += \
-	--enable-gallium-intel
+	--enable-32-bit \
+	--disable-64-bit
+
+ifdef PTXCONF_MESALIB_DRI_INTEL_GALLIUM
+MESALIB_AUTOCONF += --enable-gallium-intel
 else
-MESALIB_AUTOCONF += \
-	--disable-gallium-intel
+MESALIB_AUTOCONF += --disable-gallium-intel
 endif
 
 endif
 
 ifdef PTXCONF_ARCH_ARM
-MESALIB_AUTOCONF += \
-	--disable-gallium-intel
+MESALIB_AUTOCONF += --disable-gallium-intel
 endif
 
-ifdef PTXCONF_MESALIB_DRIVER_XLIB
-	MESALIB_AUTOCONF += --enable-gl-osmesa
-endif
-ifdef PTXCONF_MESALIB_DRIVER_DRI
-	MESALIB_AUTOCONF += --enable-gl-osmesa
-endif
 ifdef PTXCONF_MESALIB_DRIVER_OSMESA
-	MESALIB_AUTOCONF += --disable-gl-osmesa
+MESALIB_AUTOCONF += --disable-gl-osmesa
+else
+MESALIB_AUTOCONF += --enable-gl-osmesa
 endif
 
 # ----------------------------------------------------------------------------
-- 
cgit v1.2.3