From 3c55487a16efbb4ac1b615e2bf5283f59b7408da Mon Sep 17 00:00:00 2001 From: Max Kellermann <max@musicpd.org> Date: Thu, 9 Feb 2017 13:09:03 +0100 Subject: [PATCH] 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. --- NEWS | 2 ++ configure.ac | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/NEWS b/NEWS index 665e13353..7ba59b10a 100644 --- a/NEWS +++ b/NEWS @@ -1,6 +1,8 @@ ver 0.20.5 (not yet released) * 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) * input diff --git a/configure.ac b/configure.ac index a53913a2d..06d593383 100644 --- a/configure.ac +++ b/configure.ac @@ -992,7 +992,7 @@ AM_CONDITIONAL(ENABLE_VORBIS_DECODER, test x$enable_vorbis = xyes || test x$enab dnl --------------------------------- sidplay --------------------------------- if test x$enable_sidplay != xno; then dnl Check for libsidplayfp first - PKG_CHECK_MODULES([SIDPLAY], [libsidplayfp libsidutils], + PKG_CHECK_MODULES([SIDPLAY], [libsidplayfp], [found_sidplayfp=yes], [found_sidplayfp=no]) found_sidplay=$found_sidplayfp