X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=configure.ac;h=9ab434e10b213ff58295e73fdcb25ab6abc42283;hb=a0dcef5c1685813aa7f70bf7b7fd5f95f441d1b1;hp=1f99b218b4a652a22f836b01fe6a1dda4686ea63;hpb=d48c131bca7a6af52cf13bd0ceb99ad8dfed512f;p=ncmpc.git

diff --git a/configure.ac b/configure.ac
index 1f99b21..9ab434e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,17 +1,19 @@
 AC_PREREQ(2.60)
-AC_INIT(ncmpc, 0.21~git, max@duempel.org)
+AC_INIT(ncmpc, 0.22, max@duempel.org)
 
 VERSION_MAJOR=0
-VERSION_MINOR=21
+VERSION_MINOR=22
 VERSION_REVISION=0
 VERSION_EXTRA=0
 
 AC_CONFIG_SRCDIR([src/main.c])
 AC_CONFIG_AUX_DIR(build)
-AM_INIT_AUTOMAKE([foreign 1.10 dist-bzip2 subdir-objects])
+AM_INIT_AUTOMAKE([foreign 1.11 dist-xz subdir-objects])
+AM_SILENT_RULES
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_MACRO_DIR([m4])
 
+
 dnl Check for programs
 AC_PROG_CC_C99
 AC_PROG_INSTALL
@@ -96,14 +98,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],,
+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)
+PKG_CHECK_EXISTS([libmpdclient >= 2.5],
+	[have_libmpdclient_2_5=yes], [have_libmpdclient_2_5=no])
 
 dnl i18n
 
@@ -324,7 +329,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])
@@ -341,6 +345,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
@@ -369,6 +394,11 @@ AC_ARG_ENABLE(debug,
 
 if test "x$enable_debug" = xno; then
 	AM_CFLAGS="$AM_CFLAGS -DNDEBUG"
+
+	AX_APPEND_COMPILE_FLAGS([-ffunction-sections])
+	AX_APPEND_COMPILE_FLAGS([-fdata-sections])
+
+	AX_APPEND_LINK_FLAGS([-Wl,--gc-sections])
 fi
 
 AC_ARG_ENABLE(test,
@@ -403,6 +433,10 @@ dnl
 
 AC_SUBST(AM_CFLAGS)
 
+AX_APPEND_COMPILE_FLAGS([-fvisibility=hidden])
+AX_APPEND_COMPILE_FLAGS([-ffast-math])
+AX_APPEND_COMPILE_FLAGS([-ftree-vectorize])
+
 AX_APPEND_COMPILE_FLAGS([-Wall])
 AX_APPEND_COMPILE_FLAGS([-Wextra])
 AX_APPEND_COMPILE_FLAGS([-Wno-deprecated-declarations])