From e3a656708ac86fb6a8be2e739ddabf011f2dbfe0 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Fri, 8 Nov 2013 19:49:02 +0100 Subject: [PATCH] configure.ac: require libmpdclient 2.3 --- INSTALL | 2 +- NEWS | 2 +- configure.ac | 4 ++-- src/screen_song.c | 2 -- 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/INSTALL b/INSTALL index 2e92e54..85e790a 100644 --- a/INSTALL +++ b/INSTALL @@ -5,7 +5,7 @@ Requirements ------------ * a C99 compliant compiler (e.g. gcc) - * libmpdclient 2.2 + * libmpdclient 2.3 * ncurses (ncursesw for unicode / wide character support) * GLib 2.14 diff --git a/NEWS b/NEWS index 31c3600..9b45ad1 100644 --- a/NEWS +++ b/NEWS @@ -1,7 +1,7 @@ ncmpc 0.22 - not yet released * rename "playlist" to "queue" * remove useless "Connected to ..." message -* require MPD 0.16 +* require libmpdclient 2.3, MPD 0.16 ncmpc 0.21 - (2013-04-11) diff --git a/configure.ac b/configure.ac index 8877a4b..9a6a736 100644 --- a/configure.ac +++ b/configure.ac @@ -102,8 +102,8 @@ dnl Check for GLib PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.14],, [AC_MSG_ERROR([glib 2.14 is required])]) -dnl Check for libmpdclient 2.2 -PKG_CHECK_MODULES([LIBMPDCLIENT], [libmpdclient >= 2.2],, +dnl Check for libmpdclient 2.3 +PKG_CHECK_MODULES([LIBMPDCLIENT], [libmpdclient >= 2.3],, [AC_MSG_ERROR([libmpdclient2 is required])]) dnl Check for libmpdclient 2.5 (the chat screen requires this version) diff --git a/src/screen_song.c b/src/screen_song.c index c2b6c3c..32f1b85 100644 --- a/src/screen_song.c +++ b/src/screen_song.c @@ -281,7 +281,6 @@ screen_song_add_song(const struct mpd_song *song, const struct mpdclient *c) const char *value = length; -#if LIBMPDCLIENT_CHECK_VERSION(2,3,0) char buffer[64]; if (mpd_song_get_end(song) > 0) { @@ -303,7 +302,6 @@ screen_song_add_song(const struct mpd_song *song, const struct mpdclient *c) length, start); value = buffer; } -#endif screen_song_append(_(tag_labels[LABEL_LENGTH]), value, max_tag_label_width); -- 2.30.2