diff options
| author | marha <marha@users.sourceforge.net> | 2012-02-27 07:40:19 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-02-27 07:40:19 +0100 |
| commit | b3e4046e8fdcd369e61c237f8690772bf1d8c64f (patch) | |
| tree | 5ff8cf47771eede4f2ea6e7c5980fd584f2b4992 /mesalib/configure.ac | |
| parent | b436c1b7e3adefe7068fb030b83ac12a826251d3 (diff) | |
| parent | c4f44c07c6662d1ce08603945ccc4fa5afaa742a (diff) | |
| download | vcxsrv-b3e4046e8fdcd369e61c237f8690772bf1d8c64f.tar.gz vcxsrv-b3e4046e8fdcd369e61c237f8690772bf1d8c64f.tar.bz2 vcxsrv-b3e4046e8fdcd369e61c237f8690772bf1d8c64f.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
pixman/pixman/pixman-mmx.c
Diffstat (limited to 'mesalib/configure.ac')
| -rw-r--r-- | mesalib/configure.ac | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mesalib/configure.ac b/mesalib/configure.ac index 846b62300..0caa1b1bd 100644 --- a/mesalib/configure.ac +++ b/mesalib/configure.ac @@ -1582,7 +1582,7 @@ fi if test "x$enable_xvmc" = xyes; then PKG_CHECK_MODULES([XVMC], [xvmc >= 1.0.6]) - GALLIUM_STATE_TRACKERS_DIRS="$GALLIUM_STATE_TRACKERS_DIRS xorg/xvmc" + GALLIUM_STATE_TRACKERS_DIRS="$GALLIUM_STATE_TRACKERS_DIRS xvmc" HAVE_ST_XVMC="yes" fi @@ -1932,6 +1932,7 @@ CXXFLAGS="$CXXFLAGS $USER_CXXFLAGS" dnl Substitute the config AC_CONFIG_FILES([configs/autoconf + src/gallium/drivers/r300/Makefile src/gbm/Makefile src/gbm/main/gbm.pc src/egl/wayland/Makefile |