configure.ac: don't require libsidutils when building with libsidplayfp

The libsidplayfp fork has merged libsidutils into the main library.
The libsidutils we used to link with was part of the original
libsidplay project.
This commit is contained in:
Max Kellermann 2017-02-09 13:09:03 +01:00
parent 76a1cae5d8
commit 3c55487a16
2 changed files with 3 additions and 1 deletions

2
NEWS
View File

@ -1,6 +1,8 @@
ver 0.20.5 (not yet released) ver 0.20.5 (not yet released)
* tags * tags
- id3: fix memory leak on corrupt ID3 tags - id3: fix memory leak on corrupt ID3 tags
* decoder
- sidplay: don't require libsidutils when building with libsidplayfp
ver 0.20.4 (2017/02/01) ver 0.20.4 (2017/02/01)
* input * input

View File

@ -992,7 +992,7 @@ AM_CONDITIONAL(ENABLE_VORBIS_DECODER, test x$enable_vorbis = xyes || test x$enab
dnl --------------------------------- sidplay --------------------------------- dnl --------------------------------- sidplay ---------------------------------
if test x$enable_sidplay != xno; then if test x$enable_sidplay != xno; then
dnl Check for libsidplayfp first dnl Check for libsidplayfp first
PKG_CHECK_MODULES([SIDPLAY], [libsidplayfp libsidutils], PKG_CHECK_MODULES([SIDPLAY], [libsidplayfp],
[found_sidplayfp=yes], [found_sidplayfp=yes],
[found_sidplayfp=no]) [found_sidplayfp=no])
found_sidplay=$found_sidplayfp found_sidplay=$found_sidplayfp