diff options
| author | Sebastian Dröge <slomo@circular-chaos.org> | 2008-02-24 09:57:42 +0000 |
|---|---|---|
| committer | Sebastian Dröge <slomo@circular-chaos.org> | 2008-02-24 09:57:42 +0000 |
| commit | 65c75b862c22a155c4cb0035ab86cb7d9521e04f (patch) | |
| tree | 58fe90d05ee625266e48707e69afb8587a68f108 | |
| parent | 48ce4915e1b5ea8da6bef883b9e6381bea66b10f (diff) | |
| download | gstreamer-plugins-bad-65c75b862c22a155c4cb0035ab86cb7d9521e04f.tar.gz | |
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-- | ChangeLog | 6 | ||||
| -rw-r--r-- | ext/Makefile.am | 8 |
2 files changed, 11 insertions, 3 deletions
@@ -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 |