MyFavMirrors/owntone-server
1
0
Fork 0
mirror of https://github.com/owntone/owntone-server.git synced 2025-01-13 07:53:23 -05:00
Code Issues Packages Projects Releases Wiki Activity

[config] Check for libcurl if configured with --enable-spotify

Browse Source 
Also remove useless per-feature checks for libjson, since it has become
a required dependency.
This commit is contained in:
ejurgensen 2018-08-23 22:26:21 +02:00
parent 231b5615f1
commit f8205c0780
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
INSTALL
View File

@ -38,7 +38,8 @@ Optional packages:
Feature | Configure argument | Packages Feature | Configure argument | Packages
--------------------|------------------------|--------------------------------------------- --------------------|------------------------|---------------------------------------------
Chromecast | --enable-chromecast | libgnutls-dev libprotobuf-c-dev Chromecast | --enable-chromecast | libgnutls-dev libprotobuf-c-dev
LastFM | --enable-lastfm | libcurl4-gnutls-dev OR libcurl4-openssl-dev LastFM | --enable-lastfm | libcurl4-[gnutls|openssl]-dev
Spotify | --enable-spotify | libcurl4-[gnutls|openssl]-dev libspotify-dev
iTunes XML | --disable-itunes | libplist-dev iTunes XML | --disable-itunes | libplist-dev
Device verification | --disable-verification | libplist-dev libsodium-dev Device verification | --disable-verification | libplist-dev libsodium-dev
Player web UI | --disable-webinterface | libwebsockets-dev Player web UI | --disable-webinterface | libwebsockets-dev

8
configure.ac
View File

@ -308,8 +308,8 @@ AM_CONDITIONAL([COND_AVAHI], [[test "x$with_avahi" = "xyes"]])
dnl Spotify with dynamic linking to libspotify dnl Spotify with dynamic linking to libspotify
FORK_ARG_ENABLE([Spotify support], [spotify], [SPOTIFY], FORK_ARG_ENABLE([Spotify support], [spotify], [SPOTIFY],
[AS_IF([[test "x$with_json" = "xno"]], [AS_IF([[test "x$with_libcurl" = "xno"]],
[AC_MSG_ERROR([[Spotify support requires json-c]])]) [AC_MSG_ERROR([[Spotify support requires libcurl]])])
AS_IF([[test "x$with_libevent_pthreads" = "xno"]], AS_IF([[test "x$with_libevent_pthreads" = "xno"]],
[AC_MSG_ERROR([[Spotify support requires libevent_pthreads]])]) [AC_MSG_ERROR([[Spotify support requires libevent_pthreads]])])
FORK_MODULES_CHECK([SPOTIFY], [LIBSPOTIFY], [libspotify], FORK_MODULES_CHECK([SPOTIFY], [LIBSPOTIFY], [libspotify],
@ -333,9 +333,7 @@ AM_CONDITIONAL([COND_LASTFM], [[test "x$enable_lastfm" = "xyes"]])
dnl ChromeCast support with libprotobuf-c dnl ChromeCast support with libprotobuf-c
FORK_ARG_ENABLE([Chromecast support], [chromecast], [CHROMECAST], FORK_ARG_ENABLE([Chromecast support], [chromecast], [CHROMECAST],
[AS_IF([[test "x$with_json" = "xno"]], [FORK_MODULES_CHECK([FORKED_OPTS], [LIBPROTOBUF_C],
[AC_MSG_ERROR([[Chromecast support requires json-c]])])
FORK_MODULES_CHECK([FORKED_OPTS], [LIBPROTOBUF_C],
[libprotobuf-c >= 1.0.0], [protobuf_c_message_pack], [libprotobuf-c >= 1.0.0], [protobuf_c_message_pack],
[protobuf-c/protobuf-c.h], [], [protobuf-c/protobuf-c.h], [],
[FORK_FUNC_REQUIRE([FORKED_OPTS], [v0 libprotobuf-c], [FORK_FUNC_REQUIRE([FORKED_OPTS], [v0 libprotobuf-c],