diff options
| author | marha <marha@users.sourceforge.net> | 2012-01-25 08:32:49 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-01-25 08:32:49 +0100 |
| commit | 0c1cee47049afdcf74d87a23f4f4fd57867f6798 (patch) | |
| tree | 14c117114d1b996e5b04e6546b1580ea53bc26f2 /mesalib/configure.ac | |
| parent | 5be921907008288d6465962063bc10fd7a5b1906 (diff) | |
| parent | e6432710d8a586386b3c7025e845cf4f80830da3 (diff) | |
| download | vcxsrv-0c1cee47049afdcf74d87a23f4f4fd57867f6798.tar.gz vcxsrv-0c1cee47049afdcf74d87a23f4f4fd57867f6798.tar.bz2 vcxsrv-0c1cee47049afdcf74d87a23f4f4fd57867f6798.zip | |
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'mesalib/configure.ac')
| -rw-r--r-- | mesalib/configure.ac | 28 |
1 files changed, 27 insertions, 1 deletions
diff --git a/mesalib/configure.ac b/mesalib/configure.ac index f68a54fe5..18a40fcea 100644 --- a/mesalib/configure.ac +++ b/mesalib/configure.ac @@ -703,6 +703,18 @@ if test "x$enable_gles2" = xyes; then fi 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="$enableval"], + [enable_shared_glapi=no]) + +SHARED_GLAPI="0" +if test "x$enable_shared_glapi" = xyes; then + SHARED_GLAPI="1" +fi +AC_SUBST([SHARED_GLAPI]) + dnl dnl Driver configuration. Options are xlib, dri and osmesa right now. dnl More later: fbdev, ... @@ -788,7 +800,7 @@ dnl Driver specific build directories dnl dnl this variable will be prepended to SRC_DIRS and is not exported -CORE_DIRS="mapi/shared-glapi" +CORE_DIRS="" SRC_DIRS="" GLU_DIRS="sgi" @@ -798,6 +810,13 @@ GALLIUM_WINSYS_DIRS="sw" GALLIUM_DRIVERS_DIRS="galahad trace rbug noop identity" GALLIUM_STATE_TRACKERS_DIRS="" +# build shared-glapi if enabled for OpenGL or if OpenGL ES is enabled +case "x$enable_shared_glapi$enable_gles1$enable_gles2" in +x*yes*) + CORE_DIRS="$CORE_DIRS mapi/shared-glapi" + ;; +esac + # build glapi if OpenGL is enabled if test "x$enable_opengl" = xyes; then CORE_DIRS="$CORE_DIRS mapi/glapi" @@ -1365,6 +1384,13 @@ if test "x$enable_gbm" = xyes; then PKG_CHECK_MODULES([LIBUDEV], [libudev], [], AC_MSG_ERROR([gbm needs udev])) + + if test "x$enable_dri" = xyes; then + GBM_BACKEND_DIRS="$GBM_BACKEND_DIRS dri" + if test "$SHARED_GLAPI" -eq 0; then + AC_MSG_ERROR([gbm_dri requires --enable-shared-glapi]) + fi + fi fi GBM_PC_REQ_PRIV="libudev" GBM_PC_LIB_PRIV="$DLOPEN_LIBS" |