summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEmilio Pozuelo Monfort <pochu@ubuntu.com>2008-02-24 04:24:20 +0000
committerSebastian Dröge <slomo@circular-chaos.org>2008-02-24 04:24:20 +0000
commit48ce4915e1b5ea8da6bef883b9e6381bea66b10f (patch)
tree96331b6733090dab4596050109440a4187af0ffb
parent77d09884c65896052f794fed4c2c70480bb429b0 (diff)
downloadgst-plugins-bad-48ce4915e1b5ea8da6bef883b9e6381bea66b10f.tar.gz
gst-plugins-bad-48ce4915e1b5ea8da6bef883b9e6381bea66b10f.tar.bz2
gst-plugins-bad-48ce4915e1b5ea8da6bef883b9e6381bea66b10f.zip
ext/Makefile.am: Build the wildmidi plugin if it's enabled and not only when both, the timidity and wildmidi plugin, ...
Original commit message from CVS: Patch by: Emilio Pozuelo Monfort <pochu at ubuntu dot com> * ext/Makefile.am: Build the wildmidi plugin if it's enabled and not only when both, the timidity and wildmidi plugin, are enabled.
-rw-r--r--ChangeLog8
m---------common0
-rw-r--r--ext/Makefile.am6
3 files changed, 14 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 244811d8..e6fc0394 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-02-24 Sebastian Dröge <slomo@circular-chaos.org>
+
+ Patch by: Emilio Pozuelo Monfort <pochu at ubuntu dot com>
+
+ * ext/Makefile.am:
+ Build the wildmidi plugin if it's enabled and not only when
+ both, the timidity and wildmidi plugin, are enabled.
+
2008-02-23 Tim-Philipp Müller <tim at centricular dot net>
* configure.ac:
diff --git a/common b/common
-Subproject ce296a6e04ac824523dbf7bf836f91e14012ab9
+Subproject a574e6214b06fcbdfc00e952e2f3edc06997ee9
diff --git a/ext/Makefile.am b/ext/Makefile.am
index 419b27a9..108a55f2 100644
--- a/ext/Makefile.am
+++ b/ext/Makefile.am
@@ -202,6 +202,12 @@ else
TIMIDITY_DIR=
endif
+if USE_WILDMIDI
+TIMIDITY_DIR=timidity
+else
+TIMIDITY_DIR=
+endif
+
# if USE_POLYP
# POLYP_DIR=polyp
# else