From f8205c0780241c24b7a280515dc844f232bf3449 Mon Sep 17 00:00:00 2001 From: ejurgensen Date: Thu, 23 Aug 2018 22:26:21 +0200 Subject: [PATCH] [config] Check for libcurl if configured with --enable-spotify Also remove useless per-feature checks for libjson, since it has become a required dependency. --- INSTALL | 3 ++- configure.ac | 8 +++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/INSTALL b/INSTALL index 0dd87bce..947066f5 100644 --- a/INSTALL +++ b/INSTALL @@ -38,7 +38,8 @@ Optional packages: Feature | Configure argument | Packages --------------------|------------------------|--------------------------------------------- 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 Device verification | --disable-verification | libplist-dev libsodium-dev Player web UI | --disable-webinterface | libwebsockets-dev diff --git a/configure.ac b/configure.ac index be2005bd..4d2f000c 100644 --- a/configure.ac +++ b/configure.ac @@ -308,8 +308,8 @@ AM_CONDITIONAL([COND_AVAHI], [[test "x$with_avahi" = "xyes"]]) dnl Spotify with dynamic linking to libspotify FORK_ARG_ENABLE([Spotify support], [spotify], [SPOTIFY], - [AS_IF([[test "x$with_json" = "xno"]], - [AC_MSG_ERROR([[Spotify support requires json-c]])]) + [AS_IF([[test "x$with_libcurl" = "xno"]], + [AC_MSG_ERROR([[Spotify support requires libcurl]])]) AS_IF([[test "x$with_libevent_pthreads" = "xno"]], [AC_MSG_ERROR([[Spotify support requires libevent_pthreads]])]) 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 FORK_ARG_ENABLE([Chromecast support], [chromecast], [CHROMECAST], - [AS_IF([[test "x$with_json" = "xno"]], - [AC_MSG_ERROR([[Chromecast support requires json-c]])]) - FORK_MODULES_CHECK([FORKED_OPTS], [LIBPROTOBUF_C], + [FORK_MODULES_CHECK([FORKED_OPTS], [LIBPROTOBUF_C], [libprotobuf-c >= 1.0.0], [protobuf_c_message_pack], [protobuf-c/protobuf-c.h], [], [FORK_FUNC_REQUIRE([FORKED_OPTS], [v0 libprotobuf-c],