diff options
author | 2012-04-09 16:29:23 +0200 | |
---|---|---|
committer | 2012-04-09 16:29:23 +0200 | |
commit | 516f25073a726709abb83c3b73bd1e53404514c9 (patch) | |
tree | 68113731910c0df756717191a9cfaf55be514130 /configure.ac | |
parent | 6502057510696ea575a1cf0143dec02acb7cf01c (diff) | |
parent | 1ed51a80ec0979bc0be453f75548c59965fbd6f5 (diff) |
Merge branch 'master' into devel
Conflicts:
plugins/gtkui/callbacks.c
plugins/gtkui/callbacks.h
plugins/gtkui/gtkui.h
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 0b5d538a..9427c45b 100644 --- a/configure.ac +++ b/configure.ac @@ -4,14 +4,16 @@ AC_INIT([deadbeef], [devel]) AC_CONFIG_HEADER(config.h) AM_INIT_AUTOMAKE([1.11 dist-bzip2]) +AM_SILENT_RULES([yes]) AM_MAINTAINER_MODE() AC_USE_SYSTEM_EXTENSIONS +LT_INIT AC_PROG_CC AC_PROG_CXX AC_STDC_HEADERS AC_PROG_INSTALL -AC_PROG_LIBTOOL +#AC_PROG_LIBTOOL AC_CONFIG_MACRO_DIR([m4]) AC_C_BIGENDIAN AM_GNU_GETTEXT @@ -58,7 +60,6 @@ AC_SUBST(YASM_FLAGS) test "x$prefix" = xNONE && prefix=$ac_default_prefix - dnl INSANE_CFLAGS="-Wformat -Wdisabled-optimization -Wcomment -Wchar-subscripts -Wunused-function -Wunused-value -Wuninitialized -Wtype-limits -Wbad-function-cast" dnl INSANE_CXXFLAGS="-Wcomment -Wchar-subscripts -Wunused-function -Wunused-value -Wuninitialized -Wtype-limits" |