diff options
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | configure.ac | 11 |
2 files changed, 10 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am index ec78f6b96..3f7cbe1f9 100644 --- a/Makefile.am +++ b/Makefile.am @@ -906,7 +906,7 @@ if ENABLE_SOUNDCLOUD libplaylist_plugins_a_SOURCES += \ src/playlist/soundcloud_playlist_plugin.h \ src/playlist/soundcloud_playlist_plugin.c -PLAYLIST_LIBS += -lyajl +PLAYLIST_LIBS += $(YAJL_LIBS) endif # diff --git a/configure.ac b/configure.ac index 0bd8f9aba..ba2b35f69 100644 --- a/configure.ac +++ b/configure.ac @@ -274,8 +274,8 @@ AC_ARG_ENABLE(despotify, AC_ARG_ENABLE(soundcloud, AS_HELP_STRING([--enable-soundcloud], - [enable support for soundcloud (default: disable)]),, - [enable_soundcloud=no]) + [enable support for soundcloud.com]),, + [enable_soundcloud=auto]) AC_ARG_ENABLE(lame-encoder, AS_HELP_STRING([--enable-lame-encoder], @@ -708,10 +708,17 @@ fi AM_CONDITIONAL(ENABLE_DESPOTIFY, test x$enable_despotify = xyes) 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 AC_DEFINE(ENABLE_SOUNDCLOUD, 1, [Define when soundcloud is enabled]) fi AM_CONDITIONAL(ENABLE_SOUNDCLOUD, test x$enable_soundcloud = xyes) +AC_SUBST(YAJL_LIBS) dnl ---------------------------------- cdio --------------------------------- MPD_AUTO_PKG(cdio_paranoia, CDIO_PARANOIA, [libcdio_paranoia], |