diff options
| author | marha <marha@users.sourceforge.net> | 2012-12-03 09:09:06 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-12-03 09:09:06 +0100 |
| commit | b8da71ffb17d3d16706db04115e9ba1dd8bc49b9 (patch) | |
| tree | 52bf0a78e9db0a4eff7b3dbb7c3a036c01504f6a /mesalib/configure.ac | |
| parent | d2d73da59e64acdc4718e4e6790a69d967bee875 (diff) | |
| download | vcxsrv-b8da71ffb17d3d16706db04115e9ba1dd8bc49b9.tar.gz vcxsrv-b8da71ffb17d3d16706db04115e9ba1dd8bc49b9.tar.bz2 vcxsrv-b8da71ffb17d3d16706db04115e9ba1dd8bc49b9.zip | |
fontconfig mesa xserver pixman xkeyboard-config git update 3 dec 2012
fontconfig: 2442d611579bccb84f0c29e3f9ceb0a7436df812
mesa: 54ff536823bf5a431efe1f2becdb21174c146948
xserver: b51a1bd2766e7dc975ca8f1cacc3f8bd0e1a68a3
pixman: 978bab253d1d061b00b5e80aa45ab6986aac466f
xkeyboard-config: 05dcc6db64cd7425aea6d22efd6a3ecf34dbddd2
Diffstat (limited to 'mesalib/configure.ac')
| -rw-r--r-- | mesalib/configure.ac | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/mesalib/configure.ac b/mesalib/configure.ac index 4fb454407..803c25649 100644 --- a/mesalib/configure.ac +++ b/mesalib/configure.ac @@ -1273,10 +1273,6 @@ if test "x$enable_egl" = xyes; then if test "$enable_static" != yes; then # build egl_glx when libGL is built - if test "x$enable_glx" = xyes; then - HAVE_EGL_DRIVER_GLX=1 - fi - PKG_CHECK_MODULES([LIBUDEV], [libudev > 150], [have_libudev=yes],[have_libudev=no]) if test "$have_libudev" = yes; then @@ -1534,8 +1530,7 @@ for plat in $egl_platforms; do ;; wayland) - PKG_CHECK_MODULES([WAYLAND], [wayland-client >= 0.99.0 wayland-server >= 0.99.0],, \ - [AC_MSG_ERROR([cannot find libwayland-client])]) + PKG_CHECK_MODULES([WAYLAND], [wayland-client >= 1.0.2 wayland-server >= 1.0.2]) GALLIUM_WINSYS_DIRS="$GALLIUM_WINSYS_DIRS sw/wayland" WAYLAND_PREFIX=`$PKG_CONFIG --variable=prefix wayland-client` @@ -1545,6 +1540,10 @@ for plat in $egl_platforms; do x11) PKG_CHECK_MODULES([XCB_DRI2], [x11-xcb xcb-dri2 >= 1.8 xcb-xfixes]) + + if test "x$enable_glx" = xyes; then + HAVE_EGL_DRIVER_GLX=1 + fi ;; drm) |