diff options
| author | Ian Romanick <ian.d.romanick@intel.com> | 2012-01-03 11:35:59 -0800 |
|---|---|---|
| committer | Ian Romanick <ian.d.romanick@intel.com> | 2012-01-04 12:43:10 -0800 |
| commit | 4becf676e0b09b421821b6895251549ec98d4e5d (patch) | |
| tree | 894ffe597aa356454ea45376726f8b43854c99c3 /tests | |
| parent | c2e537fef26be6f9995f99e04015d0c1ac9ed5ae (diff) | |
glx: More hacking around versions of XCB that lack GLX_ARB_create_context support
Detect whether a new enough version of XCB is installed at configure
time. If it is not, don't enable the extension and don't build the
unit tests.
v2: Move the AM_CONDIATION outside the case-statement so that it is
invoked even for non-GLX builds. This prevents build failures with
osmesa, for example.
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Tested-by: Robert Hooker <robert.hooker@canonical.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/glx/Makefile.am | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/tests/glx/Makefile.am b/tests/glx/Makefile.am index 0b061176e1..cdebf5d0cb 100644 --- a/tests/glx/Makefile.am +++ b/tests/glx/Makefile.am @@ -4,6 +4,7 @@ AM_CXXFLAGS = -I$(top_builddir)/src/glx -I$(top_builddir)/src/mapi \ $(X11_CFLAGS) $(GTEST_CFLAGS) if HAVE_GTEST +if HAVE_XCB_GLX_CREATE_CONTEXT TESTS = glx_unittest check_PROGRAMS = glx_unittest @@ -13,4 +14,5 @@ glx_unittest_SOURCES = \ fake_glx_screen.cpp glx_unittest_LDADD = $(top_builddir)/src/glx/libglx.a $(GTEST_LIBS) -lgtest_main -endif
\ No newline at end of file +endif +endif |