ext/Makefile.am: Only disable the ext/timidity directory if both, wildmidi _and_...

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 (file)
--- 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 (file)
--- 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