softpipe: fix softpipe_delete_fs_state() failed assertion

[mesa.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 87fb8596935bf1bacbfe2c1cb118d4695b590ac2..fa4fd71271717ea735e4d56d65d092c6e646bc5b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -26,10 +26,6 @@ m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
 LT_PREREQ([2.2])
 LT_INIT([disable-static])
 
-dnl Save user CFLAGS and CXXFLAGS so one can override the default ones
-USER_CFLAGS="$CFLAGS"
-USER_CXXFLAGS="$CXXFLAGS"
-
 dnl Versions for external dependencies
 LIBDRM_REQUIRED=2.4.24
 LIBDRM_RADEON_REQUIRED=2.4.31
@@ -232,6 +228,9 @@ if test "x$GXX" = xyes; then
     # gcc's builtin memcmp is slower than glibc's
     # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=43052
     CXXFLAGS="$CXXFLAGS -fno-builtin-memcmp"
+
+    # Silence C++11 warnings that we don't care about.
+    CXXFLAGS="$CXXFLAGS -Wno-narrowing"
 fi
 
 dnl even if the compiler appears to support it, using visibility attributes isn't
@@ -693,9 +692,9 @@ AC_SUBST([API_DEFINES])
 
 AC_ARG_ENABLE([shared-glapi],
     [AS_HELP_STRING([--enable-shared-glapi],
-        [EXPERIMENTAL.  Enable shared glapi for OpenGL @<:@default=no@:>@])],
+        [Enable shared glapi for OpenGL @<:@default=yes@:>@])],
     [enable_shared_glapi="$enableval"],
-    [enable_shared_glapi=no])
+    [enable_shared_glapi=yes])
 
 SHARED_GLAPI="0"
 if test "x$enable_shared_glapi" = xyes; then
@@ -716,7 +715,7 @@ default_driver="xlib"
 
 case "$host_os" in
 linux*)
-    default_driver="dri";;
+    default_driver="dri"
     ;;
 *freebsd* | dragonfly* | *netbsd*)
     case "$host_cpu" in
@@ -2013,7 +2012,7 @@ if test "x$with_gallium_drivers" != x; then
                 AC_MSG_ERROR([LLVM 3.1 is required to build the radeonsi driver.])
             fi
            NEED_RADEON_GALLIUM=yes;
-            gallium_check_st "radeon/drm" "dri-radeonsi" "xorg-radeonsi"
+            gallium_check_st "radeon/drm" "dri-radeonsi" "xorg-radeonsi" "" "" "vdpau-radeonsi" ""
             ;;
         xnouveau)
             PKG_CHECK_MODULES([NOUVEAU], [libdrm_nouveau >= $LIBDRM_NOUVEAU_REQUIRED])
@@ -2157,6 +2156,7 @@ AC_CONFIG_FILES([configs/current
                src/mapi/glapi/gen/Makefile
                src/mapi/shared-glapi/Makefile
                src/mapi/glapi/tests/Makefile
+               src/mapi/shared-glapi/tests/Makefile
                src/gtest/Makefile
                src/mesa/Makefile
                src/mesa/libdricore/Makefile