From e501141c7598a12e2e0798484f96d4efe6961de7 Mon Sep 17 00:00:00 2001
From: Tim-Philipp Müller <tim@centricular.net>
Date: Wed, 16 Aug 2006 12:02:48 +0000
Subject: tests/check/Makefile.am: Don't try to run annodex unit tests if the
 annodex plugin has not been built (Fixes #351116).

Original commit message from CVS:
* tests/check/Makefile.am:
Don't try to run annodex unit tests if the annodex
plugin has not been built (Fixes #351116).
---
 ChangeLog               |  6 ++++++
 tests/check/Makefile.am | 11 +++++++++--
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 70b4259b..29469a96 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-08-16  Tim-Philipp Müller  <tim at centricular dot net>
+
+	* tests/check/Makefile.am:
+	  Don't try to run annodex unit tests if the annodex
+	  plugin has not been built (Fixes #351116).
+
 2006-08-16  Tim-Philipp Müller  <tim at centricular dot net>
 
 	* gst/autodetect/gstautoaudiosink.c:
diff --git a/tests/check/Makefile.am b/tests/check/Makefile.am
index 057ce167..a1f6fd9e 100644
--- a/tests/check/Makefile.am
+++ b/tests/check/Makefile.am
@@ -15,6 +15,14 @@ CLEANFILES = core.* test-registry.xml
 
 clean-local: clean-local-check
 
+if USE_ANNODEX
+check_annodex = \
+	elements/cmmldec \
+	elements/cmmlenc
+else
+check_annodex = 
+endif
+
 if USE_TAGLIB
 check_taglib = \
 	elements/id3v2mux \
@@ -24,11 +32,10 @@ check_taglib =
 endif
 
 check_PROGRAMS = \
+	$(check_annodex) \
 	elements/avimux \
 	elements/level \
 	elements/matroskamux \
-	elements/cmmldec \
-	elements/cmmlenc \
 	elements/icydemux \
 	$(check_taglib)
     
-- 
cgit