summaryrefslogtreecommitdiff
authorIan Romanick <ian.d.romanick@intel.com>2012-07-31 21:10:54 (GMT)
committer Ian Romanick <ian.d.romanick@intel.com>2012-08-08 17:06:25 (GMT)
commit52d6df8aa7231c1d4d80a8599af0e2c5d02c7b6c (patch) (side-by-side diff)
tree35734a3df37a2145c77bf740046841323a60ebd7
parente45a9ce474c3562f16c8a773260752d77a4fed5c (diff)
downloadmesa-52d6df8aa7231c1d4d80a8599af0e2c5d02c7b6c.zip
mesa-52d6df8aa7231c1d4d80a8599af0e2c5d02c7b6c.tar.gz
mesa/tests: Don't build glapi tests with shared-glapi
This fixes 'make check' on with --enable-shared-glapi. This test cannot work in that environment. Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--src/mapi/glapi/tests/Makefile.am2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/mapi/glapi/tests/Makefile.am b/src/mapi/glapi/tests/Makefile.am
index 96fc871..d1d2f03 100644
--- a/src/mapi/glapi/tests/Makefile.am
+++ b/src/mapi/glapi/tests/Makefile.am
@@ -1,3 +1,4 @@
+if !HAVE_SHARED_GLAPI
AM_CPPFLAGS = \
-I$(top_builddir)/src/gtest/include \
-I$(top_builddir)/src/mapi \
@@ -13,3 +14,4 @@ glapi_test_LDADD = \
$(top_builddir)/src/mapi/glapi/libglapi.la \
$(top_builddir)/src/gtest/libgtest.la \
-lpthread
+endif