conf: simplify read_configuration()

[ncmpc.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 30951377def0d6809c3e703196933bd57a4884ff..8877a4bfc688c5a490c18b587b28cb2341b13d68 100644 (file)
--- 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~git, 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-bzip2 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,9 +98,9 @@ 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],,
@@ -392,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,
@@ -426,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])