[cfg] libplist+libsodium now required, remove configure options

Need the two libraries for AirPlay 2, which can't be optional.

Means iTunes XML and device verification configure options are no longer
useful.

src/Makefile.am

@@ -1,10 +1,6 @@
 
 sbin_PROGRAMS = forked-daapd
 
-if COND_ITUNES
-ITUNES_SRC=library/filescanner_itunes.c
-endif
-
 if COND_SPOTIFY
 SPOTIFY_SRC=spotify.c spotify.h spotify_webapi.c spotify_webapi.h inputs/spotify.c
 endif
@@ -25,10 +21,8 @@ if COND_MPD
 MPD_SRC=mpd.c mpd.h
 endif
 
-if COND_RAOP_VERIFICATION
-RAOP_VERIFICATION_SRC=outputs/pair_fruit.c outputs/pair_homekit.c outputs/pair.c outputs/pair-internal.h outputs/pair.h
+PAIR_AP_SRC=outputs/pair_fruit.c outputs/pair_homekit.c outputs/pair.c outputs/pair-internal.h outputs/pair.h
 AM_CPPFLAGS += -DCONFIG_GCRYPT
-endif
 
 if COND_ALSA
 ALSA_SRC=outputs/alsa.c
@@ -103,7 +97,7 @@ forked_daapd_SOURCES = main.c \
 	cache.c cache.h \
 	library/filescanner.c library/filescanner.h \
 	library/filescanner_ffmpeg.c library/filescanner_playlist.c \
-	library/filescanner_smartpl.c $(ITUNES_SRC) \
+	library/filescanner_smartpl.c library/filescanner_itunes.c \
 	library/rssscanner.c \
 	library.c library.h \
 	$(MDNS_SRC) mdns.h \
@@ -134,8 +128,7 @@ forked_daapd_SOURCES = main.c \
 	inputs/file.c inputs/http.c inputs/pipe.c inputs/timer.c \
 	outputs.h outputs.c \
 	outputs/rtp_common.h outputs/rtp_common.c \
-	outputs/raop.c $(RAOP_VERIFICATION_SRC) \
-	outputs/airplay.c \
+	outputs/raop.c outputs/airplay.c $(PAIR_AP_SRC) \
 	outputs/streaming.c outputs/dummy.c outputs/fifo.c \
 	$(ALSA_SRC) $(PULSEAUDIO_SRC) $(CHROMECAST_SRC) \
 	evrtsp/rtsp.c evrtsp/evrtsp.h evrtsp/rtsp-internal.h evrtsp/log.h \

src/misc.c

@@ -57,11 +57,6 @@ static char *buildopts[] =
 #else
     "libav",
 #endif
-#ifdef ITUNES
-    "iTunes XML",
-#else
-    "Without iTunes XML",
-#endif
 #ifdef SPOTIFY
     "Spotify",
 #else
@@ -82,11 +77,6 @@ static char *buildopts[] =
 #else
     "Without MPD",
 #endif
-#ifdef RAOP_VERIFICATION
-    "Device verification",
-#else
-    "Without device verification",
-#endif
 #ifdef HAVE_LIBWEBSOCKETS
     "Websockets",
 #else

src/outputs/raop.c

@@ -64,10 +64,7 @@
 #include "dmap_common.h"
 #include "rtp_common.h"
 #include "outputs.h"
-
-#ifdef RAOP_VERIFICATION
 #include "pair.h"
-#endif
 
 #define ALAC_HEADER_LEN                      3
 
@@ -222,11 +219,9 @@ struct raop_session
   unsigned short control_port;
   unsigned short timing_port; // ATV4 has this set to 0, but it is not used by forked-daapd anyway
 
-#ifdef RAOP_VERIFICATION
   /* Device verification, see pair.h */
   struct pair_verify_context *pair_verify_ctx;
   struct pair_setup_context *pair_setup_ctx;
-#endif
 
   int server_fd;
 
@@ -1658,7 +1653,6 @@ raop_send_req_options(struct raop_session *rs, evrtsp_req_cb cb, const char *log
   return 0;
 }
 
-#ifdef RAOP_VERIFICATION
 static int
 raop_send_req_pin_start(struct raop_session *rs, evrtsp_req_cb cb, const char *log_caller)
 {
@@ -1696,14 +1690,6 @@ raop_send_req_pin_start(struct raop_session *rs, evrtsp_req_cb cb, const char *l
 
   return 0;
 }
-#else
-static int
-raop_send_req_pin_start(struct raop_session *rs, evrtsp_req_cb cb, const char *log_caller)
-{
-  DPRINTF(E_LOG, L_RAOP, "Device '%s' requires verification, but forked-daapd was built with --disable-verification\n", rs->devname);
-  return -1;
-}
-#endif
 
 
 /* ------------------------------ Session handling -------------------------- */
@@ -3987,7 +3973,6 @@ raop_cb_startup_options(struct evrtsp_request *req, void *arg)
 /* ------------------------- tvOS device verification ----------------------- */
 /*                 e.g. for the ATV4 (read it from the bottom and up)         */
 
-#ifdef RAOP_VERIFICATION
 static int
 raop_pair_response_process(int step, struct evrtsp_request *req, struct raop_session *rs)
 {
@@ -4365,16 +4350,6 @@ raop_device_authorize(struct output_device *device, const char *pin, int callbac
   return 1;
 }
 
-#else
-static int
-raop_pair_verify(struct raop_session *rs)
-{
-  DPRINTF(E_LOG, L_RAOP, "Device '%s' requires verification, but forked-daapd was built with --disable-verification\n", rs->devname);
-
-  return -1;
-}
-#endif /* RAOP_VERIFICATION */
-
 
 /* ------------------ RAOP devices discovery - mDNS callback ---------------- */
 /*                              Thread: main (mdns)                           */
@@ -4995,7 +4970,5 @@ struct output_definition output_raop =
   .metadata_prepare = raop_metadata_prepare,
   .metadata_send = raop_metadata_send,
   .metadata_purge = raop_metadata_purge,
-#ifdef RAOP_VERIFICATION
   .device_authorize = raop_device_authorize,
-#endif
 };