plugins/rbspotify/Makefile.am plugins/rbspotify/appkey.c plugins/rbspotify/audio.c plugins/rbspotify/audio.cpp plugins/rbspotify/audio.h plugins/rbspotify/rb-spotify-plugin.c plugins/rbspotify/rb-spotify-plugin.h plugins/rbspotify/rb-spotify-source.c plugins/rbspotify/rb-spotify-source.h plugins/rbspotify/rb-spotify-src.c plugins/rbspotify/rb-spotify-src.h plugins/rbspotify/spotify-prefs.glade plugins/rbspotify/spotify.rb-plugin.in @@ -505,6 +505,18 @@ AC_SUBST(LIBSEXY_CFLAGS) AC_SUBST(LIBSEXY_LIBS) AM_CONDITIONAL(WITH_INTERNAL_LIBSEXY, test "x$with_internal_libsexy" = "xyes") +AC_ARG_WITH(spotify, + AC_HELP_STRING([--with-spotify], + [Build with spotify support]),, + with_spotify=no) +if test "x$with_spotify" = "xyes"; then + PKG_CHECK_MODULES(LIBSPOTIFY, libspotify >= 0.0.0, + with_internal_libspotify=yes, + with_internal_libspotify=no) +fi +AC_SUBST(LIBSPOTIFY_CFLAGS) +AC_SUBST(LIBSPOTIFY_LIBS) +AM_CONDITIONAL(WITH_SPOTIFY, test "x$with_spotify" = "xyes") dnl warnings bits, copied from gnome-keyring configure.in dnl Turn on the additional warnings last, so -Werror doesn't affect other tests. @@ -799,6 +811,7 @@ sources/Makefile corelib/Makefile plugins/Makefile plugins/sample/Makefile +plugins/rbspotify/Makefile plugins/audiocd/Makefile plugins/coherence/Makefile plugins/coherence/upnp_coherence/Makefile @@ -917,12 +930,15 @@ if test x"$use_gnome_keyring" = xyes; then else AC_MSG_NOTICE([ gnome-keyring support disabled]) fi -if test x"$need_libsexy" = xyes; then - if test x"$with_internal_libsexy" = xyes; then - AC_MSG_NOTICE([ using internal libsexy]) - else - AC_MSG_NOTICE([** using system-wide libsexy]) - fi +if test x"$with_internal_libsexy" = xyes; then + AC_MSG_NOTICE([ using internal libsexy]) +else + AC_MSG_NOTICE([** using system-wide libsexy]) +fi +if test x"$with_spotify" = xyes; then + AC_MSG_NOTICE([** Spotify support enabled]) +else + AC_MSG_NOTICE([ Spotify support disabled]) fi if test "x$enable_fm_radio" != xno; then AC_MSG_NOTICE([** FM radio support enabled]) configure.ac @@ -85,6 +85,9 @@ G_BEGIN_DECLS #define CONF_PLAYER_TRANSITION_TIME CONF_PREFIX "/player/transition_time" #define CONF_PLAYER_NETWORK_BUFFER_SIZE CONF_PREFIX "/player/network_buffer_size" +#define CONF_SPOTIFY_USERNAME CONF_PREFIX "/spotify/username" +#define CONF_SPOTIFY_PASSWORD CONF_PREFIX "/spotify/password" + G_END_DECLS #endif /* __RB_PREFERENCES_H */ lib/rb-preferences.h @@ -57,6 +57,11 @@ if ENABLE_FM_RADIO SUBDIRS += fmradio endif +if WITH_SPOTIFY +SUBDIRS += rbspotify +endif + + noinst_LTLIBRARIES = librbplugins.la librbplugins_la_SOURCES = \ plugins/Makefile.am a4f30db26c0a3ddd0449d98731988590e8488069 Ivan Kelly ivan@bleurgh.com http://github.com/ivankelly/Rhythmbox-Spotify-Plugin/commit/be7140eaa3bf62c571bd2057ce4c2f6eaa9e85b1 be7140eaa3bf62c571bd2057ce4c2f6eaa9e85b1 2009-05-17T11:27:21-07:00 2009-05-17T11:27:21-07:00 initial commit of my changes e6568190bad74395c9e1a345024ed6590dc1fc15 Ivan Kelly ivan@bleurgh.com