summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastian Dröge <slomo@circular-chaos.org>2008-02-24 09:57:42 +0000
committerSebastian Dröge <slomo@circular-chaos.org>2008-02-24 09:57:42 +0000
commit65c75b862c22a155c4cb0035ab86cb7d9521e04f (patch)
tree58fe90d05ee625266e48707e69afb8587a68f108
parent48ce4915e1b5ea8da6bef883b9e6381bea66b10f (diff)
downloadgst-plugins-bad-65c75b862c22a155c4cb0035ab86cb7d9521e04f.tar.gz
gst-plugins-bad-65c75b862c22a155c4cb0035ab86cb7d9521e04f.tar.bz2
gst-plugins-bad-65c75b862c22a155c4cb0035ab86cb7d9521e04f.zip
ext/Makefile.am: Only disable the ext/timidity directory if both, wildmidi _and_ timidity are not available.
Original commit message from CVS: * ext/Makefile.am: Only disable the ext/timidity directory if both, wildmidi _and_ timidity are not available.
-rw-r--r--ChangeLog6
-rw-r--r--ext/Makefile.am8
2 files changed, 11 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index e6fc0394..c6fba083 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2008-02-24 Sebastian Dröge <slomo@circular-chaos.org>
+ * ext/Makefile.am:
+ Only disable the ext/timidity directory if both, wildmidi
+ _and_ timidity are not available.
+
+2008-02-24 Sebastian Dröge <slomo@circular-chaos.org>
+
Patch by: Emilio Pozuelo Monfort <pochu at ubuntu dot com>
* ext/Makefile.am:
diff --git a/ext/Makefile.am b/ext/Makefile.am
index 108a55f2..ef399c58 100644
--- a/ext/Makefile.am
+++ b/ext/Makefile.am
@@ -198,15 +198,17 @@ endif
if USE_TIMIDITY
TIMIDITY_DIR=timidity
-else
-TIMIDITY_DIR=
endif
if USE_WILDMIDI
TIMIDITY_DIR=timidity
-else
+endif
+
+if !USE_WILDMIDI
+if !USE_TIMIDITY
TIMIDITY_DIR=
endif
+endif
# if USE_POLYP
# POLYP_DIR=polyp