[Xfce4-commits] <xfce4-volumed:master> Partially applied a patch from Yves-Alexis Perez to allow custom CFLAGS in release mode

[Steve Dodier]

Updating branch refs/heads/master
         to c76a8a531c8be646ac15a33fc8168e4387250d0d (commit)
       from caec4ccd142a961f4a575601eb27857f24062fac (commit)

commit c76a8a531c8be646ac15a33fc8168e4387250d0d
Author: Steve Dodier <sidnioulz at gmail.com>
Date:   Thu Mar 3 11:33:42 2011 +0100

    Partially applied a patch from Yves-Alexis Perez to allow custom CFLAGS in release mode

 ChangeLog    |    3 +++
 configure.ac |    8 ++++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 7de69f3..551defa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2011-03-03  Steve Dodier <sidnioulz at gmail.com>
+	* Partially applying a patch from Yves-Alexis Perez to allow custom CFLAGS when building in release mode
+
 2011-03-02  Steve Dodier <sidnioulz at gmail.com>
 	* Another check to avoid SIGFPE when calculating average volume (valid card/track but no volume channels)
 
diff --git a/configure.ac b/configure.ac
index 49287b6..cf2e7bb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -59,7 +59,7 @@ AM_CONDITIONAL(HAVE_LIBNOTIFY, [test "$HAVE_LIBNOTIFY" = "1"])
 if test "x$enable_debug" = "xyes"; then
   CFLAGS="-g"
 else
-  CFLAGS="-O2 -DNDEBUG"
+  CFLAGS="$CFLAGS -O2 -DNDEBUG"
 fi
 
 AC_OUTPUT([
@@ -73,7 +73,11 @@ echo "Xfce4-Volumed"
 echo "	Installing in : ${prefix}"
 echo "	Using LibNotify : ${with_libnotify}"
 echo "	Compiler : ${CC}"
-echo "	Compiler flags : ${CFLAGS}"
+if test "x$enable_debug" = "xyes"; then
+	echo "	Compiler flags : ${CFLAGS} (edit configure.ac to change them)"
+else
+	echo "	Compiler flags : ${CFLAGS}"
+fi
 echo ""
 echo "	Configuration is done OK."
 echo ""