diff options
| author | Max Kellermann <max@duempel.org> | 2009-01-30 19:43:25 +0100 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2009-01-30 19:43:25 +0100 |
| commit | 590082767530834ed3abff9009f9169dba4bd16f (patch) | |
| tree | 8669fb2d7aac1f3081f3cc1dd10a5e06d3ee5e31 | |
| parent | 5b85288664f6f45172bb812a739e9b0cc8f1e974 (diff) | |
| download | mpd-590082767530834ed3abff9009f9169dba4bd16f.tar.gz mpd-590082767530834ed3abff9009f9169dba4bd16f.tar.xz mpd-590082767530834ed3abff9009f9169dba4bd16f.zip | |
configure.ac: detect jack_set_info_function()
jack_set_info_function() is not provided by older libjack versions.
Attempt to detect if it is available.
| -rw-r--r-- | configure.ac | 10 | ||||
| -rw-r--r-- | src/output/jack_plugin.c | 5 |
2 files changed, 15 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index b3b0d233b..6f6711792 100644 --- a/configure.ac +++ b/configure.ac @@ -620,6 +620,16 @@ if test x$enable_jack = xyes; then [enable_jack=no;AC_MSG_WARN([JACK not found -- disabling])]) fi +if test x$enable_jack = xyes; then + # check whether jack_set_info_function() is available + old_LIBS=$LIBS + LIBS="$LIBS $JACK_LIBS" + + AC_CHECK_FUNCS(jack_set_info_function) + + LIBS=$old_LIBS +fi + AM_CONDITIONAL(HAVE_JACK, test x$enable_jack = xyes) if test x$enable_id3 = xyes; then diff --git a/src/output/jack_plugin.c b/src/output/jack_plugin.c index 0439fa5cd..4f2edbf87 100644 --- a/src/output/jack_plugin.c +++ b/src/output/jack_plugin.c @@ -165,11 +165,13 @@ mpd_jack_error(const char *msg) g_warning("%s", msg); } +#ifdef HAVE_JACK_SET_INFO_FUNCTION static void mpd_jack_info(const char *msg) { g_message("%s", msg); } +#endif static void * mpd_jack_init(struct audio_output *ao, @@ -205,7 +207,10 @@ mpd_jack_init(struct audio_output *ao, config_get_block_unsigned(param, "ringbuffer_size", 32768); jack_set_error_function(mpd_jack_error); + +#ifdef HAVE_JACK_SET_INFO_FUNCTION jack_set_info_function(mpd_jack_info); +#endif return jd; } |