Merge release 0.15.12 from branch 'v0.15.x'

Conflicts: NEWS configure.ac
2010-07-20 23:03:06 +02:00
parent fb19aa355e 0fec8e0864
commit c0da938d4f
5 changed files with 44 additions and 13 deletions
--- a/configure.ac
+++ b/configure.ac
@@ -1033,6 +1033,10 @@ if test x$enable_wildmidi = xyes; then
 	AC_CHECK_LIB(WildMidi, WildMidi_Init,,
 		AC_MSG_ERROR([libwildmidi not found]))

+	AC_CHECK_LIB(WildMidi, WildMidi_SampledSeek,
+		[AC_DEFINE(HAVE_WILDMIDI_SAMPLED_SEEK, 1,
+			[Defined if WildMidi_SampledSeek() is available (libwildmidi <= 0.2.2)])])
+
 	CFLAGS=$oldcflags
 	LIBS=$oldlibs
 	CPPFLAGS=$oldcppflags