aboutsummaryrefslogtreecommitdiffstats
path: root/configure.ac
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2011-09-16 07:52:39 +0200
committerMax Kellermann <max@duempel.org>2011-09-16 07:52:39 +0200
commit87b624f5d5233af1727b683c6ace1e957d837ed4 (patch)
tree98b18a6e20721b9b9063779d7bc0b38457dffe43 /configure.ac
parente1efc71ad3389ef8b2bdcf8dba5dc124c9a5bf7f (diff)
parent443e96381a0e24d9c22578ba6f7fb96de1814994 (diff)
downloadmpd-87b624f5d5233af1727b683c6ace1e957d837ed4.tar.gz
mpd-87b624f5d5233af1727b683c6ace1e957d837ed4.tar.xz
mpd-87b624f5d5233af1727b683c6ace1e957d837ed4.zip
Merge branch 'v0.16.x'
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac10
1 files changed, 6 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac
index 63b1e5133..5e325265c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -37,7 +37,9 @@ PKG_PROG_PKG_CONFIG
dnl ---------------------------------------------------------------------------
dnl Declare Variables
dnl ---------------------------------------------------------------------------
+AC_SUBST(AM_CPPFLAGS,"")
AC_SUBST(AM_CFLAGS,"")
+AC_SUBST(AM_CXXFLAGS,"")
AC_SUBST(MPD_LIBS)
AC_SUBST(MPD_CFLAGS)
@@ -1469,10 +1471,9 @@ dnl CFLAGS
dnl ---------------------------------------------------------------------------
dnl ---------------------------------- debug ----------------------------------
-#if test "x$enable_debug" = xno; then
- # don't set NDEBUG for now, until MPD is stable
- #AM_CFLAGS="$AM_CFLAGS -DNDEBUG"
-#fi
+if test "x$enable_debug" = xno; then
+ AM_CPPFLAGS="$AM_CPPFLAGS -DNDEBUG"
+fi
dnl ----------------------------------- GCC -----------------------------------
if test x$GCC = xyes
@@ -1497,6 +1498,7 @@ fi
dnl ---------------------------- warnings as errors ---------------------------
if test "x$enable_werror" = xyes; then
AM_CFLAGS="$AM_CFLAGS -Werror -pedantic-errors"
+ AM_CXXFLAGS="$AM_CXXFLAGS -Werror"
fi
dnl ---------------------------------------------------------------------------