From 48ce4915e1b5ea8da6bef883b9e6381bea66b10f Mon Sep 17 00:00:00 2001 From: Emilio Pozuelo Monfort Date: Sun, 24 Feb 2008 04:24:20 +0000 Subject: ext/Makefile.am: Build the wildmidi plugin if it's enabled and not only when both, the timidity and wildmidi plugin, ... Original commit message from CVS: Patch by: Emilio Pozuelo Monfort * ext/Makefile.am: Build the wildmidi plugin if it's enabled and not only when both, the timidity and wildmidi plugin, are enabled. --- ChangeLog | 8 ++++++++ common | 2 +- ext/Makefile.am | 6 ++++++ 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 244811d8..e6fc0394 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2008-02-24 Sebastian Dröge + + Patch by: Emilio Pozuelo Monfort + + * ext/Makefile.am: + Build the wildmidi plugin if it's enabled and not only when + both, the timidity and wildmidi plugin, are enabled. + 2008-02-23 Tim-Philipp Müller * configure.ac: diff --git a/common b/common index ce296a6e..a574e621 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit ce296a6e04ac824523dbf7bf836f91e14012ab9d +Subproject commit a574e6214b06fcbdfc00e952e2f3edc06997ee93 diff --git a/ext/Makefile.am b/ext/Makefile.am index 419b27a9..108a55f2 100644 --- a/ext/Makefile.am +++ b/ext/Makefile.am @@ -202,6 +202,12 @@ else TIMIDITY_DIR= endif +if USE_WILDMIDI +TIMIDITY_DIR=timidity +else +TIMIDITY_DIR= +endif + # if USE_POLYP # POLYP_DIR=polyp # else -- cgit v1.2.1