From d8c829fa0ce155ffe22a697250f66b741fc29f09 Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@duempel.org>
Date: Fri, 16 Sep 2011 07:34:52 +0200
Subject: configure.ac: pass AM_CXXFLAGS, AM_CPPFLAGS to Makefile.am

---
 configure.ac | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'configure.ac')

diff --git a/configure.ac b/configure.ac
index 55928433..24b9a857 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)
-- 
cgit v1.2.3


From 344b6dd179d1312cf370f1fbdcddc11370c52f73 Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@duempel.org>
Date: Fri, 16 Sep 2011 07:38:00 +0200
Subject: configure.ac: enable -Werror for C++

---
 configure.ac | 1 +
 1 file changed, 1 insertion(+)

(limited to 'configure.ac')

diff --git a/configure.ac b/configure.ac
index 24b9a857..1c0a38ce 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1480,6 +1480,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 ---------------------------------------------------------------------------
-- 
cgit v1.2.3


From 443e96381a0e24d9c22578ba6f7fb96de1814994 Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@duempel.org>
Date: Fri, 16 Sep 2011 07:31:06 +0200
Subject: configure.ac: disable assertions in the non-debugging build

Add -DNDEBUG to AM_CPPFLAGS.
---
 NEWS         | 1 +
 configure.ac | 7 +++----
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'configure.ac')

diff --git a/NEWS b/NEWS
index 9bd89393..90d3b0fc 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,5 @@
 ver 0.16.5 (2010/??/??)
+* configure.ac: disable assertions in the non-debugging build
 * pcm_format: fix 32-to-24 bit conversion (the "silence" bug)
 * input:
   - rewind: reduce heap usage
diff --git a/configure.ac b/configure.ac
index 1c0a38ce..9a957627 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1451,10 +1451,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
-- 
cgit v1.2.3