diff options
| author | marha <marha@users.sourceforge.net> | 2012-08-13 10:11:17 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-08-13 10:11:17 +0200 |
| commit | f5a4fa87e844b3ea2658a2355a4c4ac3393a65a1 (patch) | |
| tree | 921a5a742930124e7bd7e9a7e73f6029bd74338d /mesalib/configure.ac | |
| parent | ec4051f308e8e84146e0ecc39b6d228e500e9636 (diff) | |
| parent | 9ddf44af81782451cee798e06749ce3067a14a41 (diff) | |
| download | vcxsrv-f5a4fa87e844b3ea2658a2355a4c4ac3393a65a1.tar.gz vcxsrv-f5a4fa87e844b3ea2658a2355a4c4ac3393a65a1.tar.bz2 vcxsrv-f5a4fa87e844b3ea2658a2355a4c4ac3393a65a1.zip | |
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'mesalib/configure.ac')
| -rw-r--r-- | mesalib/configure.ac | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/mesalib/configure.ac b/mesalib/configure.ac index b6481a69f..2ecedaf0b 100644 --- a/mesalib/configure.ac +++ b/mesalib/configure.ac @@ -689,9 +689,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 @@ -976,6 +976,7 @@ xyesno) # find the DRI deps for libGL if test "$x11_pkgconfig" = yes; then + PKG_CHECK_MODULES([XCB],[x11-xcb xcb-glx >= 1.8.1]) dri_modules="x11 xext xdamage xfixes x11-xcb xcb-glx" # add xf86vidmode if available @@ -2153,6 +2154,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 |