oysteikt
/
mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

configure.ac: detect libsidplay2 and related with pkg-config 

The comment about requiring libtool from 7 years ago is obsolete these
days.
This commit is contained in:
Max Kellermann 2016-07-29 15:21:38 +02:00
parent 071cacc9a4
commit d916890a8f
2 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
NEWS
View File

@ -3,6 +3,7 @@ ver 0.19.18 (not yet released)
- ffmpeg: fix crash with older FFmpeg versions (< 3.0) - ffmpeg: fix crash with older FFmpeg versions (< 3.0)
- ffmpeg: log detailed error message - ffmpeg: log detailed error message
- ffmpeg: support FFmpeg 3.1 - ffmpeg: support FFmpeg 3.1
- sidplay: detect libsidplay2 with pkg-config
* output * output
- shout: recognize setting "encoder" instead of "encoding" - shout: recognize setting "encoder" instead of "encoding"
* require gcc 4.7 or newer * require gcc 4.7 or newer

16
configure.ac
View File

@ -1333,9 +1333,9 @@ 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
# we're not using pkg-config here PKG_CHECK_MODULES([SIDPLAY], [libsidplay2 libsidutils],
# because libsidplay2's .pc file requires libtool [found_sidplay=yes],
AC_CHECK_LIB([sidplay2],[main],[found_sidplay=yes],[found_sidplay=no],[]) [found_sidplay=no])
MPD_AUTO_PRE(sidplay, [sidplay decoder plugin], MPD_AUTO_PRE(sidplay, [sidplay decoder plugin],
[libsidplay2 not found]) [libsidplay2 not found])
@ -1345,18 +1345,12 @@ if test x$enable_sidplay != xno; then
AC_CHECK_LIB([resid-builder], [main], AC_CHECK_LIB([resid-builder], [main],
[found_sidplay=yes], [found_sidplay=no]) [found_sidplay=yes], [found_sidplay=no])
if test x$found_sidplay = xyes; then
AC_CHECK_LIB([sidutils],[main],[:],[found_sidplay=no],[])
fi
MPD_AUTO_RESULT(sidplay, [sidplay decoder plugin], MPD_AUTO_RESULT(sidplay, [sidplay decoder plugin],
[libresid-builder or libsidutils not found]) [libresid-builder not found])
fi fi
if test x$enable_sidplay = xyes; then if test x$enable_sidplay = xyes; then
AC_SUBST(SIDPLAY_LIBS,"-lsidplay2 -lresid-builder -lsidutils") SIDPLAY_LIBS="$SIDPLAY_LIBS -lresid-builder"
AC_SUBST(SIDPLAY_CFLAGS,)
AC_DEFINE(ENABLE_SIDPLAY, 1, [Define for libsidplay2 support]) AC_DEFINE(ENABLE_SIDPLAY, 1, [Define for libsidplay2 support])
fi fi