r300g: do not abort if a constant buffer is too large

[mesa.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index c40c84269509c04178bd486150ec7344e7b84116..7f6f8db2463ce72b4c856d10af6b4927e04d9abe 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ AC_PREREQ([2.59])
 
 dnl Versioning - scrape the version from configs/default
 m4_define([mesa_version],
-    [m4_esyscmd([${MAKE-make} -s -f bin/version.mk version | tr -d '\n'])])
+    [m4_esyscmd([${MAKE-make} -s -f bin/version.mk version | tr -d '\n' | tr -d '\r'])])
 m4_ifval(mesa_version,,
     [m4_fatal([Failed to get the Mesa version from `make -f bin/version.mk version`])])
 
@@ -474,7 +474,7 @@ GLU_DIRS="sgi"
 GALLIUM_DIRS="auxiliary drivers state_trackers"
 GALLIUM_TARGET_DIRS=""
 GALLIUM_WINSYS_DIRS="sw"
-GALLIUM_DRIVERS_DIRS="softpipe failover trace identity"
+GALLIUM_DRIVERS_DIRS="softpipe failover trace rbug identity"
 GALLIUM_STATE_TRACKERS_DIRS=""
 
 case "$mesa_driver" in
@@ -757,6 +757,7 @@ AC_ARG_ENABLE([gles-overlay],
 
 API_DEFINES=""
 APIS=""
+GLES_OVERLAY=0
 if test "x$enable_opengl" = xno; then
     API_DEFINES="$API_DEFINES -DFEATURE_GL=0"
 else
@@ -775,11 +776,12 @@ if test "x$enable_gles_overlay" = xyes -o \
     "x$enable_gles1" = xyes -o "x$enable_gles2" = xyes; then
     CORE_DIRS="mapi/es1api mapi/es2api $CORE_DIRS"
     if test "x$enable_gles_overlay" = xyes; then
-        CORE_DIRS="$CORE_DIRS mesa/es"
+        GLES_OVERLAY=1
     fi
 fi
 AC_SUBST([API_DEFINES])
 AC_SUBST([APIS])
+AC_SUBST([GLES_OVERLAY])
 
 dnl If $with_dri_drivers is yes, directories will be added through
 dnl platform checks
@@ -1331,7 +1333,7 @@ yes)
                 if test "x$enable_gles1" != xyes -a "x$enable_gles2" != xyes; then
                     CORE_DIRS="mapi/es1api mapi/es2api $CORE_DIRS"
                 fi
-                CORE_DIRS="$CORE_DIRS mesa/es"
+                GLES_OVERLAY=1
                 EGL_CLIENT_APIS="$EGL_CLIENT_APIS "'$(GLESv1_CM_LIB) $(GLESv2_LIB)'
             fi
            tracker=""
@@ -1448,7 +1450,7 @@ if test "x$enable_gallium_llvm" = xyes; then
        fi
        LLVM_LDFLAGS=`$LLVM_CONFIG --ldflags`
        GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS llvmpipe"
-       DEFINES="$DEFINES -DMESA_LLVM -D__STDC_CONSTANT_MACROS"
+       DEFINES="$DEFINES -DGALLIUM_LLVMPIPE -D__STDC_CONSTANT_MACROS"
        MESA_LLVM=1
     else
        MESA_LLVM=0