diff options
| author | Max Kellermann <max@duempel.org> | 2009-01-13 20:30:58 +0100 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2009-01-13 23:08:54 +0100 |
| commit | 9f21cb9dda22d0c589b41acfd04da1a1969d68da (patch) | |
| tree | acd7a4eb8533474e4e044133ed4e213327809073 | |
| parent | eee8bba78de8eba50f7cc7ca828ca06ed89c5893 (diff) | |
configure.ac: detect libid3tag without pkg-config
libid3tag comes without a pkg-config file, and it is usually added by
distribution packages. For those without .pc file, attempt to
auto-detect the library with AC_CHECK_LIB.
| -rw-r--r-- | NEWS | 1 | ||||
| -rw-r--r-- | configure.ac | 11 |
2 files changed, 9 insertions, 3 deletions
@@ -10,6 +10,7 @@ MPD 0.14.1 - not yet released * fix minor memory leak in decoder_tag() * fix cross-fading bug: it used to play some chunks of the new song twice * playlist: fix assertion failure during playlist load +* detect libid3tag without pkg-config ver 0.14 (2008/12/25) diff --git a/configure.ac b/configure.ac index 03212e1c5..f0973ba8b 100644 --- a/configure.ac +++ b/configure.ac @@ -452,9 +452,14 @@ fi AM_CONDITIONAL(HAVE_JACK, test x$enable_jack = xyes) if test x$enable_id3 = xyes; then - PKG_CHECK_MODULES([ID3TAG], [id3tag], - AC_DEFINE(HAVE_ID3TAG, 1, [Define to use id3tag]), - enable_id3=no) + PKG_CHECK_MODULES([ID3TAG], [id3tag],, + AC_CHECK_LIB(id3tag, id3_file_open, + [ID3TAG_LIBS="-lid3tag -lz" ID3TAG_CFLAGS=""], + enable_id3=no)) +fi + +if test x$enable_id3 = xyes; then + AC_DEFINE(HAVE_ID3TAG, 1, [Define to use id3tag]) fi AM_CONDITIONAL(HAVE_ID3TAG, test x$enable_id3 = xyes) |