glsl: fix compiling warning from gcc 4.7

[mesa.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index fd6c877f3c125c42ded2d3e40839ecb738c9dcad..ac7d49f1f60ffd568cc6b496d124134cf4a99ca3 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -37,7 +37,7 @@ USER_CXXFLAGS="$CXXFLAGS"
 dnl Versions for external dependencies
 LIBDRM_REQUIRED=2.4.24
 LIBDRM_RADEON_REQUIRED=2.4.31
-LIBDRM_INTEL_REQUIRED=2.4.30
+LIBDRM_INTEL_REQUIRED=2.4.32
 LIBDRM_NOUVEAU_REQUIRED=0.6
 DRI2PROTO_REQUIRED=2.6
 GLPROTO_REQUIRED=1.4.14
@@ -702,6 +702,7 @@ if test "x$enable_shared_glapi" = xyes; then
     # libGL will use libglapi for function lookups (IN_DRI_DRIVER means to use
     # the remap table)
     DEFINES="$DEFINES -DIN_DRI_DRIVER"
+    SRC_DIRS="$SRC_DIRS mapi/shared-glapi"
 fi
 AC_SUBST([SHARED_GLAPI])
 AM_CONDITIONAL(HAVE_SHARED_GLAPI, test $SHARED_GLAPI = 1)
@@ -1941,6 +1942,12 @@ for driver in $GALLIUM_DRIVERS_DIRS; do
         xgalahad)
             HAVE_GALAHAD_GALLIUM=yes;
            ;;
+       xidentity)
+           HAVE_IDENTITY_GALLIUM=yes;
+           ;;
+       xnoop)
+           HAVE_NOOP_GALLIUM=yes;
+           ;;
         *)
             GALLIUM_MAKE_DIRS="$GALLIUM_MAKE_DIRS $driver"
            ;;
@@ -1948,6 +1955,8 @@ for driver in $GALLIUM_DRIVERS_DIRS; do
 done
 
 AM_CONDITIONAL(HAVE_GALAHAD_GALLIUM, test x$HAVE_GALAHAD_GALLIUM = xyes)
+AM_CONDITIONAL(HAVE_IDENTITY_GALLIUM, test x$HAVE_IDENTITY_GALLIUM = xyes)
+AM_CONDITIONAL(HAVE_NOOP_GALLIUM, test x$HAVE_NOOP_GALLIUM = xyes)
 AC_SUBST([GALLIUM_MAKE_DIRS])
 
 dnl prepend CORE_DIRS to SRC_DIRS
@@ -1977,6 +1986,7 @@ AC_CONFIG_FILES([configs/autoconf
                src/egl/wayland/wayland-egl/wayland-egl.pc
                src/egl/wayland/wayland-drm/Makefile
                src/glx/Makefile
+               src/mapi/shared-glapi/Makefile
                src/mesa/drivers/dri/dri.pc
                src/mesa/drivers/dri/Makefile
                src/mesa/drivers/dri/common/Makefile