aboutsummaryrefslogtreecommitdiff
path: root/mesalib/configure.ac
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2012-06-15 08:55:18 +0200
committermarha <marha@users.sourceforge.net>2012-06-15 08:55:18 +0200
commitd6f64084b9bc07d0bdd527f9354f2d1d962ed16d (patch)
tree81b2652d421992fd63143a04885e332e83e18d07 /mesalib/configure.ac
parent669b562a737c9418c53bfae69c0dbf1aabe318b4 (diff)
parent7a2af605c2c2b0d2e9bbb0b161eba8842acefbcb (diff)
downloadvcxsrv-d6f64084b9bc07d0bdd527f9354f2d1d962ed16d.tar.gz
vcxsrv-d6f64084b9bc07d0bdd527f9354f2d1d962ed16d.tar.bz2
vcxsrv-d6f64084b9bc07d0bdd527f9354f2d1d962ed16d.zip
Merge remote-tracking branch 'origin/released'
Conflicts: fontconfig/src/fcint.h fontconfig/src/fcstat.c mesalib/src/mapi/glapi/gen/GL3x.xml xorg-server/glx/glxext.h
Diffstat (limited to 'mesalib/configure.ac')
-rw-r--r--mesalib/configure.ac7
1 files changed, 4 insertions, 3 deletions
diff --git a/mesalib/configure.ac b/mesalib/configure.ac
index 29ee87bb0..d5f8cd719 100644
--- a/mesalib/configure.ac
+++ b/mesalib/configure.ac
@@ -2166,9 +2166,12 @@ AC_CONFIG_FILES([configs/autoconf
src/egl/wayland/wayland-drm/Makefile
src/glsl/tests/Makefile
src/glx/Makefile
+ src/glx/tests/Makefile
src/mapi/shared-glapi/Makefile
+ src/mapi/glapi/tests/Makefile
src/gtest/Makefile
src/mesa/libdricore/Makefile
+ src/mesa/main/tests/Makefile
src/mesa/drivers/dri/dri.pc
src/mesa/drivers/dri/Makefile
src/mesa/drivers/dri/common/Makefile
@@ -2177,9 +2180,7 @@ AC_CONFIG_FILES([configs/autoconf
src/mesa/drivers/dri/nouveau/Makefile
src/mesa/drivers/dri/r200/Makefile
src/mesa/drivers/dri/radeon/Makefile
- src/mesa/drivers/dri/swrast/Makefile
- tests/Makefile
- tests/glx/Makefile])
+ src/mesa/drivers/dri/swrast/Makefile])
dnl Replace the configs/current symlink
AC_CONFIG_COMMANDS([configs],[