mpdclient: move code to mpdclient_connected()

[ncmpc.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 14edebecad986fb2d1f9a320b42bbdeeb02f20cb..cbd3989de985d45eb8f82df69448d31ac88f1f6a 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -99,17 +99,13 @@ else
 fi
 
 dnl Check for GLib
-PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.14],,
-       [AC_MSG_ERROR([glib 2.14 is required])])
+PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.30],,
+       [AC_MSG_ERROR([glib 2.30 is required])])
 
-dnl Check for libmpdclient 2.3
-PKG_CHECK_MODULES([LIBMPDCLIENT], [libmpdclient >= 2.3],,
+dnl Check for libmpdclient 2.9
+PKG_CHECK_MODULES([LIBMPDCLIENT], [libmpdclient >= 2.9],,
        [AC_MSG_ERROR([libmpdclient2 is required])])
 
-dnl Check for libmpdclient 2.5 (the chat screen requires this version)
-PKG_CHECK_EXISTS([libmpdclient >= 2.5],
-       [have_libmpdclient_2_5=yes], [have_libmpdclient_2_5=no])
-
 dnl i18n
 
 AC_ARG_ENABLE([locale],
@@ -156,8 +152,7 @@ fi
 dnl enable colors
 AC_ARG_ENABLE([colors],
        AS_HELP_STRING([--enable-colors],
-               [Enable color support]),
-               [enable_colors=$enableval],
+               [Enable color support]),,
                [enable_colors=auto])
 AC_MSG_CHECKING([whether to include color support])
 AS_IF([ test "x$enable_colors" = xyes || test "x$enable_colors" = xauto ],
@@ -184,8 +179,12 @@ AC_ARG_ENABLE([lirc],
                [Enable LIRC support]),,
        [enable_lirc=no])
 if test x$enable_lirc = xyes; then
-       PKG_CHECK_MODULES([LIBLIRCCLIENT], [liblircclient0],,
-               [AC_MSG_ERROR([liblircclient0 not found])])
+       PKG_CHECK_MODULES([LIBLIRCCLIENT], [lirc],,
+               [PKG_CHECK_MODULES([LIBLIRCCLIENT], [liblircclient0],,
+                       [AC_MSG_ERROR([lirc not found])]
+               )]
+       )
+
        AC_DEFINE([ENABLE_LIRC], [1], [Enable LIRC support])
 fi
 
@@ -215,8 +214,7 @@ AC_CHECK_LIB([$(expr substr $CURSES_LIB 3 99)],
 
 AC_ARG_ENABLE([mouse], 
        AS_HELP_STRING([--enable-mouse],
-               [Enable curses getmouse support @<:@default=yes@:>@]),
-               [enable_mouse=$enableval],
+               [Enable curses getmouse support @<:@default=yes@:>@]),,
                [enable_mouse=auto])
 
 AC_MSG_CHECKING([whether to include mouse support])
@@ -293,8 +291,7 @@ dnl Optional screen - lyrics
 AC_MSG_CHECKING([whether to include the lyrics screen]) 
 AC_ARG_ENABLE([lyrics-screen], 
               AS_HELP_STRING([--enable-lyrics-screen],
-               [Enable lyrics screen @<:@default=no@:>@]),
-       [enable_lyrics_screen=$enableval],
+               [Enable lyrics screen @<:@default=no@:>@]),,
        [enable_lyrics_screen=no])
 
 case "$host_os" in
@@ -352,13 +349,10 @@ AC_ARG_ENABLE([chat-screen],
                [Enable chat screen @<:@default=no@:>@]),,
        [enable_chat_screen=no])
 if test "x$enable_chat_screen" = "xauto"; then
-       enable_chat_screen=$have_libmpdclient_2_5
+       enable_chat_screen=yes
 fi
 AC_MSG_RESULT([$enable_chat_screen])
 if test "x$enable_chat_screen" = "xyes" ; then
-       if test "x$have_libmpdclient_2_5" = "xno"; then
-               AC_MSG_ERROR(The chat screen requires at least libmpclient 2.5)
-       fi
        AC_DEFINE(ENABLE_CHAT_SCREEN, 1, [Enable chat screen])
 fi
 AM_CONDITIONAL(ENABLE_CHAT_SCREEN, test x$enable_chat_screen = xyes)