summaryrefslogtreecommitdiffstats
path: root/configure.ac
diff options
context:
space:
mode:
authorJason Ekstrand <jason.ekstrand@intel.com>2016-02-05 15:03:04 -0800
committerJason Ekstrand <jason.ekstrand@intel.com>2016-02-05 15:03:44 -0800
commit741744f691d6ef63e9f9a4c03136f969f2ffb0bf (patch)
tree7c9192a0648c2d90bb08efbc21ebcb7a6e2b873a /configure.ac
parent9645b8eb1f1b79e537ad8ddb683507df7bc9da58 (diff)
parenteb63640c1d38a200a7b1540405051d3ff79d0d8a (diff)
downloadexternal_mesa3d-741744f691d6ef63e9f9a4c03136f969f2ffb0bf.zip
external_mesa3d-741744f691d6ef63e9f9a4c03136f969f2ffb0bf.tar.gz
external_mesa3d-741744f691d6ef63e9f9a4c03136f969f2ffb0bf.tar.bz2
Merge commit mesa-public/master into vulkan
This pulls in the patches that move all of the compiler stuff around
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac2
1 files changed, 1 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac
index 44d16c6..a18080d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2445,6 +2445,7 @@ CXXFLAGS="$CXXFLAGS $USER_CXXFLAGS"
dnl Substitute the config
AC_CONFIG_FILES([Makefile
src/Makefile
+ src/compiler/Makefile
src/egl/Makefile
src/egl/main/egl.pc
src/egl/wayland/wayland-drm/Makefile
@@ -2514,7 +2515,6 @@ AC_CONFIG_FILES([Makefile
src/gallium/winsys/virgl/vtest/Makefile
src/gbm/Makefile
src/gbm/main/gbm.pc
- src/glsl/Makefile
src/glx/Makefile
src/glx/apple/Makefile
src/glx/tests/Makefile