From 0f1b1bb44d7dfea657116ef7bf1c4d8fd5cbce24 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Mon, 8 Dec 2014 18:38:03 +0100 Subject: [PATCH] configure.ac: add option to disable CUE --- Makefile.am | 14 +++++++++----- configure.ac | 6 ++++++ src/playlist/PlaylistRegistry.cxx | 2 ++ 3 files changed, 17 insertions(+), 5 deletions(-) diff --git a/Makefile.am b/Makefile.am index abf039b68..28fa4c520 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1389,15 +1389,10 @@ libplaylist_plugins_a_SOURCES = \ src/playlist/CloseSongEnumerator.hxx \ src/playlist/MemorySongEnumerator.cxx \ src/playlist/MemorySongEnumerator.hxx \ - src/playlist/cue/CueParser.cxx src/playlist/cue/CueParser.hxx \ src/playlist/plugins/ExtM3uPlaylistPlugin.cxx \ src/playlist/plugins/ExtM3uPlaylistPlugin.hxx \ src/playlist/plugins/M3uPlaylistPlugin.cxx \ src/playlist/plugins/M3uPlaylistPlugin.hxx \ - src/playlist/plugins/CuePlaylistPlugin.cxx \ - src/playlist/plugins/CuePlaylistPlugin.hxx \ - src/playlist/plugins/EmbeddedCuePlaylistPlugin.cxx \ - src/playlist/plugins/EmbeddedCuePlaylistPlugin.hxx \ src/playlist/plugins/PlsPlaylistPlugin.cxx \ src/playlist/plugins/PlsPlaylistPlugin.hxx \ src/playlist/PlaylistRegistry.cxx src/playlist/PlaylistRegistry.hxx @@ -1411,6 +1406,15 @@ PLAYLIST_LIBS = \ $(EXPAT_LIBS) \ $(FLAC_LIBS) +if ENABLE_CUE +libplaylist_plugins_a_SOURCES += \ + src/playlist/cue/CueParser.cxx src/playlist/cue/CueParser.hxx \ + src/playlist/plugins/CuePlaylistPlugin.cxx \ + src/playlist/plugins/CuePlaylistPlugin.hxx \ + src/playlist/plugins/EmbeddedCuePlaylistPlugin.cxx \ + src/playlist/plugins/EmbeddedCuePlaylistPlugin.hxx +endif + if ENABLE_DESPOTIFY libplaylist_plugins_a_SOURCES += \ src/lib/despotify/DespotifyUtils.cxx \ diff --git a/configure.ac b/configure.ac index 5f510d22e..addb278ab 100644 --- a/configure.ac +++ b/configure.ac @@ -786,6 +786,12 @@ fi MPD_ENABLE_AUTO_PKG(mms, MMS, [libmms >= 0.4], [libmms mms:// protocol support], [libmms not found]) +dnl --------------------------------------------------------------------------- +dnl Playlist Plugins +dnl --------------------------------------------------------------------------- + +MPD_ARG_ENABLE(cue, CUE, [CUE sheet parser], yes) + dnl --------------------------------------------------------------------------- dnl Neighbor Plugins dnl --------------------------------------------------------------------------- diff --git a/src/playlist/PlaylistRegistry.cxx b/src/playlist/PlaylistRegistry.cxx index d7bc3600a..ad0afa628 100644 --- a/src/playlist/PlaylistRegistry.cxx +++ b/src/playlist/PlaylistRegistry.cxx @@ -57,8 +57,10 @@ const struct playlist_plugin *const playlist_plugins[] = { #ifdef ENABLE_SOUNDCLOUD &soundcloud_playlist_plugin, #endif +#ifdef ENABLE_CUE &cue_playlist_plugin, &embcue_playlist_plugin, +#endif nullptr };