diff options
| author | Max Kellermann <max@musicpd.org> | 2018-01-11 19:13:19 +0100 |
|---|---|---|
| committer | Max Kellermann <max@musicpd.org> | 2018-01-11 19:13:19 +0100 |
| commit | 326488aeebe59299138da04854b91d4cad8d40e4 (patch) | |
| tree | 8ddb24a6da724815af31ce1d133d598b4b0e89b7 | |
| parent | cb86023bd7056fbd99d544985688504b56e52508 (diff) | |
configure.ac: decouple libyajl detection from SoundCloud
Allow using libyajl in other parts of MPD.
| -rw-r--r-- | configure.ac | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index 73fb3f51f..ca9ee1691 100644 --- a/configure.ac +++ b/configure.ac @@ -560,6 +560,14 @@ dnl -------------------------------- expat -------------------------------- MPD_ENABLE_AUTO_PKG(expat, EXPAT, [expat], [expat XML parser], [expat not found]) +dnl -------------------------------- yajl ------------------------------------- + +if test x$enable_soundcloud != xno; then + PKG_CHECK_MODULES([YAJL], [yajl >= 2.0], + [found_yajl=yes], + [found_yajl=no]) +fi + dnl --------------------------------- inotify --------------------------------- AC_CHECK_FUNCS(inotify_init inotify_init1) @@ -705,10 +713,8 @@ MPD_ENABLE_AUTO_PKG(nfs, NFS, [libnfs], [NFS input plugin], [libnfs not found]) dnl --------------------------------- Soundcloud ------------------------------ -MPD_AUTO([soundcloud], [soundcloud.com support], [libyajl not found], - [PKG_CHECK_MODULES([YAJL], [yajl >= 2.0], - [found_soundcloud=yes], - [found_soundcloud=no])]) +MPD_DEPENDS([enable_soundcloud], [found_yajl], + [soundcloud.com support], [libyajl not found]) MPD_DEFINE_CONDITIONAL(enable_soundcloud, ENABLE_SOUNDCLOUD, [soundcloud.com support]) |