X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=configure.ac;h=37b126bca6dc10971a4f7d9993a836e1eb1d0f56;hb=refs%2Ftags%2Fv0.21;hp=c50445eaa898f18f2e4fc8ee0c287463f4ee4252;hpb=cf6fec9daebebb24b4ae21cca93e21b916b88d0c;p=ncmpc.git

diff --git a/configure.ac b/configure.ac
index c50445e..37b126b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ(2.60)
-AC_INIT(ncmpc, 0.21~git, max@duempel.org)
+AC_INIT(ncmpc, 0.21, max@duempel.org)
 
 VERSION_MAJOR=0
 VERSION_MINOR=21
@@ -76,6 +76,8 @@ mingw32* | windows*)
 		[AC_CHECK_LIB([nsl],[gethostbyname],[LIBS="$LIBS -lnsl"],
 		[AC_MSG_ERROR(No UNIX gethostbyname API found)])
 		])
+
+	HAVE_WINDOWS=0
 esac
 AM_CONDITIONAL([HAVE_WINDOWS], [test $HAVE_WINDOWS -eq 1])
 
@@ -94,14 +96,17 @@ else
 	fi
 fi
 
-dnl Check for glib-2.12
-PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.12],,
-	[AC_MSG_ERROR([glib 2.12 is required])])
+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],,
 	[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
 
@@ -322,7 +327,6 @@ AC_DEFINE_UNQUOTED([LYRICS_PLUGIN_DIR], ["$lyrics_plugin_dir"],
 AC_SUBST(lyrics_plugin_dir)
 
 AM_CONDITIONAL(ENABLE_PLUGIN_LIBRARY, test x$enable_lyrics_screen = xyes)
-AM_CONDITIONAL(ENABLE_SCREEN_TEXT, test x$enable_lyrics_screen = xyes)
 
 dnl Optional screen - outputs
 AC_MSG_CHECKING([whether to include the outputs screen])
@@ -339,6 +343,27 @@ AM_CONDITIONAL(ENABLE_OUTPUTS_SCREEN, test x$enable_outputs_screen = xyes)
 AC_MSG_RESULT([$enable_outputs_screen])
 
 
+dnl Optional screen - client-to-client chat
+AC_MSG_CHECKING([whether to include the chat screen])
+AC_ARG_ENABLE([chat-screen],
+              AC_HELP_STRING([--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
+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)
+
+AM_CONDITIONAL(ENABLE_SCREEN_TEXT,
+	test x$enable_lyrics_screen = xyes -o x$enable_chat_screen = xyes)
+
 dnl
 dnl Windows OS Resource File
 dnl