main: remove unused function sigstop()

[ncmpc.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 8877a4bfc688c5a490c18b587b28cb2341b13d68..e2791a5b27636a975cbdeae92d5d5750b6d75244 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,14 +1,14 @@
 AC_PREREQ(2.60)
-AC_INIT(ncmpc, 0.22~git, max@duempel.org)
+AC_INIT(ncmpc, 0.26, max@duempel.org)
 
 VERSION_MAJOR=0
-VERSION_MINOR=22
+VERSION_MINOR=26
 VERSION_REVISION=0
 VERSION_EXTRA=0
 
 AC_CONFIG_SRCDIR([src/main.c])
 AC_CONFIG_AUX_DIR(build)
-AM_INIT_AUTOMAKE([foreign 1.11 dist-bzip2 dist-xz 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])
@@ -28,7 +28,7 @@ dnl initialize variables
 dnl =======================================================
 
 dnl i18n
-ALL_LINGUAS=`grep -v '^\#' po/LINGUAS`
+ALL_LINGUAS=`grep -v '^\#' $srcdir/po/LINGUAS`
 
 set -- $CFLAGS
 
@@ -102,14 +102,10 @@ 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.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],
@@ -184,8 +180,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
 
@@ -352,13 +352,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)