Makefile.am: merge ncmpc_headers into src_ncmpc_SOURCES

[ncmpc.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 4cbb542228cc28d9e0349eb12ea7d244ab6d513a..0f15fd3ea4b6c14db6a3b5fd8a108a202688e5eb 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,17 +1,19 @@
 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=21
+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.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
@@ -26,7 +28,7 @@ dnl initialize variables
 dnl =======================================================
 
 dnl i18n
-ALL_LINGUAS=`grep -v '^\#' po/LINGUAS`
+ALL_LINGUAS=`grep -v '^\#' $srcdir/po/LINGUAS`
 
 set -- $CFLAGS
 
@@ -100,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.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)
@@ -182,8 +184,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