diff options
| author | Matt Turner <mattst88@gmail.com> | 2012-08-17 14:54:25 -0700 |
|---|---|---|
| committer | Matt Turner <mattst88@gmail.com> | 2012-08-22 11:08:06 -0700 |
| commit | d9b109892d862709fe9696ecee5764d35501c982 (patch) | |
| tree | bb726e7edac3d0774ef93115dc751d93d38c5052 | |
| parent | 8c9b78aad155df31ade2f385b897609c43597249 (diff) | |
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@whitecape.org>
| -rw-r--r-- | configure.ac | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/configure.ac b/configure.ac index 2ba55e97218..efd5d648912 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" |