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

configure.ac: detect libyajl for playlist/soundcloud

Browse Source
This commit is contained in:
Max Kellermann
2012-03-01 20:18:16 +01:00
parent 553d4e9283
commit d07a6edd2f
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.am
View File

@@ -906,7 +906,7 @@ if ENABLE_SOUNDCLOUD
libplaylist_plugins_a_SOURCES += \ libplaylist_plugins_a_SOURCES += \
src/playlist/soundcloud_playlist_plugin.h \ src/playlist/soundcloud_playlist_plugin.h \
src/playlist/soundcloud_playlist_plugin.c src/playlist/soundcloud_playlist_plugin.c
PLAYLIST_LIBS += -lyajl PLAYLIST_LIBS += $(YAJL_LIBS)
endif endif
# #

11
configure.ac
View File

@@ -274,8 +274,8 @@ AC_ARG_ENABLE(despotify,
AC_ARG_ENABLE(soundcloud, AC_ARG_ENABLE(soundcloud,
AS_HELP_STRING([--enable-soundcloud], AS_HELP_STRING([--enable-soundcloud],
[enable support for soundcloud (default: disable)]),, [enable support for soundcloud.com]),,
[enable_soundcloud=no]) [enable_soundcloud=auto])
AC_ARG_ENABLE(lame-encoder, AC_ARG_ENABLE(lame-encoder,
AS_HELP_STRING([--enable-lame-encoder], AS_HELP_STRING([--enable-lame-encoder],
@@ -708,10 +708,17 @@ fi
AM_CONDITIONAL(ENABLE_DESPOTIFY, test x$enable_despotify = xyes) AM_CONDITIONAL(ENABLE_DESPOTIFY, test x$enable_despotify = xyes)
dnl --------------------------------- Soundcloud ------------------------------ dnl --------------------------------- Soundcloud ------------------------------
if test x$enable_soundcloud != xno; then
AC_CHECK_LIB([yajl], [yajl_alloc],
[found_soundcloud=yes YAJL_LIBS=-lyajl],
[found_soundcloud=no])
fi
MPD_AUTO_RESULT([soundcloud], [soundcloud.com support], [libyajl not found])
if test x$enable_soundcloud = xyes; then if test x$enable_soundcloud = xyes; then
AC_DEFINE(ENABLE_SOUNDCLOUD, 1, [Define when soundcloud is enabled]) AC_DEFINE(ENABLE_SOUNDCLOUD, 1, [Define when soundcloud is enabled])
fi fi
AM_CONDITIONAL(ENABLE_SOUNDCLOUD, test x$enable_soundcloud = xyes) AM_CONDITIONAL(ENABLE_SOUNDCLOUD, test x$enable_soundcloud = xyes)
AC_SUBST(YAJL_LIBS)
dnl ---------------------------------- cdio --------------------------------- dnl ---------------------------------- cdio ---------------------------------
MPD_AUTO_PKG(cdio_paranoia, CDIO_PARANOIA, [libcdio_paranoia], MPD_AUTO_PKG(cdio_paranoia, CDIO_PARANOIA, [libcdio_paranoia],