diff --git a/configure.ac b/configure.ac
index 85642cad560d4e7f251314747f9a14ac1ca4e137..84a922996ad82d3a3d3420f2bd281ae4d2967286 100644 (file)
--- a/configure.ac
+++ b/configure.ac
AC_PREREQ(2.60)
-AC_INIT(ncmpc, 0.16~git, max@duempel.org)
+AC_INIT(ncmpc, 0.20~git, max@duempel.org)
AC_CONFIG_SRCDIR([src/main.c])
AC_CONFIG_AUX_DIR(build)
-AM_INIT_AUTOMAKE([foreign 1.9 dist-bzip2])
+AM_INIT_AUTOMAKE([foreign 1.10 dist-bzip2 subdir-objects])
AM_CONFIG_HEADER([config.h])
AC_CONFIG_MACRO_DIR([m4])
fi
dnl Check for glib-2.4
-PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.4],,
- [AC_MSG_ERROR([glib 2.4 is required])])
+PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.12],,
+ [AC_MSG_ERROR([glib 2.12 is required])])
-dnl Check for libmpdclient 2.0
-PKG_CHECK_MODULES([LIBMPDCLIENT], [libmpdclient >= 2.0],,
+dnl Check for libmpdclient 2.2
+PKG_CHECK_MODULES([LIBMPDCLIENT], [libmpdclient >= 2.2],,
[AC_MSG_ERROR([libmpdclient2 is required])])
AM_CFLAGS="$AM_CFLAGS -DNDEBUG"
fi
+AC_ARG_ENABLE(test,
+ AS_HELP_STRING([--enable-test],
+ [build the test programs @<:@default=no@:>@]),,
+ enable_test=$enable_debug)
+
+AM_CONDITIONAL(ENABLE_TEST, test "x$enable_test" = xyes)
+
dnl
dnl CFLAGS
CHECK_CFLAG([-Wextra])
CHECK_CFLAG([-Wno-deprecated-declarations])
CHECK_CFLAG([-Wmissing-prototypes])
-CHECK_CFLAG([-Wdeclaration-after-statement])
CHECK_CFLAG([-Wshadow])
CHECK_CFLAG([-Wpointer-arith])
CHECK_CFLAG([-Wstrict-prototypes])