Module: Mesa Branch: master Commit: 52d6df8aa7231c1d4d80a8599af0e2c5d02c7b6c URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=52d6df8aa7231c1d4d80a8599af0e2c5d02c7b6c
Author: Ian Romanick <[email protected]> Date: Tue Jul 31 14:10:54 2012 -0700 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 <[email protected]> --- src/mapi/glapi/tests/Makefile.am | 2 ++ 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 _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
