configure.ac: require libmpdclient 2.3

diff --git a/INSTALL b/INSTALL
index 2e92e541a35cca4c9b62976d445078cb02b15700..85e790a400878be9bd980c5e26f317d2c55a9633 100644 (file)
--- 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 31c360045aeb4efc9184bdc8692a52b03f8f1916..9b45ad128e74dbc91f98c7c224ba2159fa2ce79f 100644 (file)
--- 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 8877a4bfc688c5a490c18b587b28cb2341b13d68..9a6a736284f9a2bb263d70773c4dc70fbd80d7d4 100644 (file)
--- 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 c2b6c3c5f67be21c1a397d996c83f74d70c8271a..32f1b85eaa50c6d289ecd6d5997e733ad3ff9063 100644 (file)
--- 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);