diff options
author | Daniel Stone <daniel@fooishbar.org> | 2012-10-04 01:21:57 +0000 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2012-10-08 15:49:23 +1000 |
commit | 14db948127e549ea9234e02d8e112de3871f8f9f (patch) | |
tree | e026e83268b55a6b78cd9b4aa3c12f73434490c1 /tests/modetest | |
parent | a83444c925b18b3db431336360d6915aaf21f727 (diff) |
configure.ac: Allow forcible disabling of Cairo support
We don't want to build libdrm tests with Cairo support under Poky, since
they're never used and also cause a build loop from libdrm -> cairo ->
mesa-dri -> libdrm.
To avoid variance in build results, introduce a --disable-cairo-tests
switch.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'tests/modetest')
-rw-r--r-- | tests/modetest/Makefile.am | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/tests/modetest/Makefile.am b/tests/modetest/Makefile.am index b5ec7717..065ae132 100644 --- a/tests/modetest/Makefile.am +++ b/tests/modetest/Makefile.am @@ -1,8 +1,7 @@ AM_CFLAGS = \ -I$(top_srcdir)/include/drm \ -I$(top_srcdir)/libkms/ \ - -I$(top_srcdir) \ - $(CAIRO_CFLAGS) + -I$(top_srcdir) noinst_PROGRAMS = \ modetest @@ -12,5 +11,9 @@ modetest_SOURCES = \ modetest_LDADD = \ $(top_builddir)/libdrm.la \ - $(top_builddir)/libkms/libkms.la \ - $(CAIRO_LIBS) + $(top_builddir)/libkms/libkms.la + +if HAVE_CAIRO +AM_CFLAGS += $(CAIRO_CFLAGS) +modetest_LDADD += $(CAIRO_LIBS) +endif |