summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorDamien Lespiau <damien.lespiau@intel.com>2012-09-15 14:26:18 +0100
committerRobert Bragg <robert@linux.intel.com>2013-01-22 17:47:23 +0000
commit27fb2948872d873cd324f8b8f3b23d97046d0017 (patch)
treeb72be48391c8ff7ead7ef8c5387802bf0b5c992c /tests
parent5d62185f1ce14a20eb78a227cf5da1f3c112984c (diff)
downloadcogl-27fb2948872d873cd324f8b8f3b23d97046d0017.tar.gz
tests: Don't build test-journal with --disable-glib
test-journal needs cogl_glib_source_new() which is not available when compiling cogl with --disable-glib. Reviewed-by: Robert Bragg <robert@linux.intel.com> (cherry picked from commit 71fadbbfacad6a7c0ed7b06252d1e5e5dadf66f5)
Diffstat (limited to 'tests')
-rw-r--r--tests/micro-perf/Makefile.am6
1 files changed, 5 insertions, 1 deletions
diff --git a/tests/micro-perf/Makefile.am b/tests/micro-perf/Makefile.am
index 6171ab22..236fc5fb 100644
--- a/tests/micro-perf/Makefile.am
+++ b/tests/micro-perf/Makefile.am
@@ -11,7 +11,11 @@ test_conformance_CPPFLAGS = \
-DTESTS_DATADIR=\""$(top_srcdir)/tests/data"\"
-noinst_PROGRAMS = test-journal
+noinst_PROGRAMS =
+
+if USE_GLIB
+noinst_PROGRAMS += test-journal
+endif
AM_CFLAGS = $(COGL_DEP_CFLAGS) $(COGL_EXTRA_CFLAGS)