Mesa (master): build: Put mapi/shared-glapi in CORE_DIRS
Matt Turner
mattst88 at kemper.freedesktop.org
Wed Aug 22 18:07:31 UTC 2012
Module: Mesa
Branch: master
Commit: d9b109892d862709fe9696ecee5764d35501c982
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=d9b109892d862709fe9696ecee5764d35501c982
Author: Matt Turner <mattst88 at gmail.com>
Date: Fri Aug 17 14:54:25 2012 -0700
build: Put mapi/shared-glapi in CORE_DIRS
SRC_DIRS was overwritten (visible in the second hunk).
Also don't require mapi/shared-glapi to be built for GLES.
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
---
configure.ac | 13 +------------
1 files changed, 1 insertions(+), 12 deletions(-)
diff --git a/configure.ac b/configure.ac
index 2ba55e9..efd5d64 100644
--- a/configure.ac
+++ b/configure.ac
@@ -719,7 +719,7 @@ if test "x$enable_shared_glapi" = xyes; then
# libGL will use libglapi for function lookups (IN_DRI_DRIVER means to use
# the remap table)
DEFINES="$DEFINES -DIN_DRI_DRIVER"
- SRC_DIRS="$SRC_DIRS mapi/shared-glapi"
+ CORE_DIRS="mapi/shared-glapi"
fi
AC_SUBST([SHARED_GLAPI])
AM_CONDITIONAL(HAVE_SHARED_GLAPI, test "x$enable_shared_glapi" = xyes)
@@ -727,10 +727,6 @@ AM_CONDITIONAL(HAVE_SHARED_GLAPI, test "x$enable_shared_glapi" = xyes)
dnl
dnl Driver specific build directories
dnl
-
-dnl this variable will be prepended to SRC_DIRS and is not exported
-CORE_DIRS=""
-
SRC_DIRS="gtest"
GLU_DIRS="sgi"
GALLIUM_DIRS="auxiliary drivers state_trackers"
@@ -739,13 +735,6 @@ 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"
More information about the mesa-commit
mailing list