summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--tests/check/Makefile.am8
2 files changed, 12 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index f8ef5205..6577b1ca 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2006-07-13 Tim-Philipp Müller <tim at centricular dot net>
+ * tests/check/Makefile.am:
+ Only run mpeg2enc unit test if we built the mpeg2enc plugin.
+
+2006-07-13 Tim-Philipp Müller <tim at centricular dot net>
+
* configure.ac:
Don't error out in configure if mjpegtools dev is not there.
diff --git a/tests/check/Makefile.am b/tests/check/Makefile.am
index 3df83e7b..d5d5ac47 100644
--- a/tests/check/Makefile.am
+++ b/tests/check/Makefile.am
@@ -26,10 +26,16 @@ SUPPRESSIONS = $(top_srcdir)/common/gst.supp
clean-local: clean-local-check
+if USE_MPEG2ENC
+check_mpeg2enc = elements/mpeg2enc
+else
+check_mpeg2enc =
+endif
+
check_PROGRAMS = \
elements/gdppay \
elements/gdpdepay \
- elements/mpeg2enc
+ $(check_mpeg2enc)
TESTS = $(check_PROGRAMS)