summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--ext/Makefile.am8
2 files changed, 11 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index e6fc0394e..c6fba0831 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 108a55f2a..ef399c580 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