Mesa (master): build: Make src/gtest before src/mesa

Matt Turner mattst88 at kemper.freedesktop.org
Wed Jan 16 21:28:55 UTC 2013


Module: Mesa
Branch: master
Commit: 99629735e79084597a4255c2a9bf9fab38d73007
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=99629735e79084597a4255c2a9bf9fab38d73007

Author: Matt Turner <mattst88 at gmail.com>
Date:   Mon Jan 14 14:38:01 2013 -0800

build: Make src/gtest before src/mesa

Fixes a make check problem where libgtest.la wasn't build before tests
that want to link with it.

---

 configure.ac |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index 2d74b82..99a08fd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -739,7 +739,6 @@ AM_CONDITIONAL(HAVE_SHARED_GLAPI, test "x$enable_shared_glapi" = xyes)
 dnl
 dnl Driver specific build directories
 dnl
-SRC_DIRS="gtest"
 GALLIUM_DIRS="auxiliary drivers state_trackers"
 GALLIUM_TARGET_DIRS=""
 GALLIUM_WINSYS_DIRS="sw"
@@ -764,7 +763,7 @@ fi
 # build glsl and mesa if OpenGL or OpenGL ES is enabled
 case "x$enable_opengl$enable_gles1$enable_gles2" in
 x*yes*)
-    CORE_DIRS="mapi/glapi/gen $CORE_DIRS glsl mesa"
+    CORE_DIRS="mapi/glapi/gen $CORE_DIRS gtest glsl mesa"
     ;;
 esac
 




More information about the mesa-commit mailing list