From: Sebastian Dröge <slomo@circular-chaos.org>
Date: Sun, 24 Feb 2008 09:57:42 +0000 (+0000)
Subject: ext/Makefile.am: Only disable the ext/timidity directory if both, wildmidi _and_... 
X-Git-Tag: 1.19.3~507^2~20400
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=65c75b862c22a155c4cb0035ab86cb7d9521e04f;p=platform%2Fupstream%2Fgstreamer.git

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.
---

diff --git a/ChangeLog b/ChangeLog
index e6fc039..c6fba08 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 108a55f..ef399c5 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