X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=configure.ac;h=119500c5313754fd32106bb20d2b83be7df5111c;hb=890aea27735880084cea458beac09fc689bfc324;hp=85642cad560d4e7f251314747f9a14ac1ca4e137;hpb=b83b254f0f12e74f0e4f0ebb78c75fd7c265e466;p=ncmpc.git

diff --git a/configure.ac b/configure.ac
index 85642ca..119500c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,8 +1,8 @@
 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])
 
@@ -139,12 +139,12 @@ else
 	fi
 fi
 
-dnl Check for glib-2.4
-PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.4],,
-	[AC_MSG_ERROR([glib 2.4 is required])])
+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 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])])
 
 
@@ -375,6 +375,13 @@ if test "x$enable_debug" = xno; then
 	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
@@ -386,7 +393,6 @@ CHECK_CFLAG([-Wall])
 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])