[pulseaudio-commits] 2 commits - bootstrap.sh configure.ac src/Makefile.am

[Tanu Kaskinen]

 bootstrap.sh    |    4 ----
 configure.ac    |    2 +-
 src/Makefile.am |    6 +++---
 3 files changed, 4 insertions(+), 8 deletions(-)

New commits:
commit 3f78d149cf2260278a3276f7e470ee27d183bc3f
Author: Javier Jardón <jjardon at gnome.org>
Date:   Sat Oct 26 23:26:13 2013 +0100

    build-sys: Add -fdiagnostics-color=auto to CFLAGS
    
    As a way to highlight warnings and errors in GCC output
    This will be available in GCC 4.9, but some distros backported
    the feature to lower versions
    
    http://gcc.gnu.org/gcc-4.9/changes.html

diff --git a/bootstrap.sh b/bootstrap.sh
index 08e0fa4..011aa13 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -47,10 +47,6 @@ fi
 intltoolize --version >/dev/null || DIE=1
 test "$DIE" = 1 && exit 1
 
-if type -p colorgcc > /dev/null ; then
-   export CC=colorgcc
-fi
-
 autopoint --force
 AUTOPOINT='intltoolize --automake --copy' autoreconf --force --install --verbose
 
diff --git a/configure.ac b/configure.ac
index 76490f4..39bb5c3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -174,7 +174,7 @@ esac
 #### Compiler flags ####
 
 AX_APPEND_COMPILE_FLAGS(
-    [-Wall -W -Wextra -pipe -Wno-long-long -Wno-overlength-strings -Wunsafe-loop-optimizations -Wundef -Wformat=2 -Wlogical-op -Wsign-compare -Wformat-security -Wmissing-include-dirs -Wformat-nonliteral -Wold-style-definition -Wpointer-arith -Winit-self -Wdeclaration-after-statement -Wfloat-equal -Wmissing-prototypes -Wstrict-prototypes -Wredundant-decls -Wmissing-declarations -Wmissing-noreturn -Wshadow -Wendif-labels -Wcast-align -Wstrict-aliasing -Wwrite-strings -Wno-unused-parameter -ffast-math -fno-common -fdiagnostics-show-option],
+    [-Wall -W -Wextra -pipe -Wno-long-long -Wno-overlength-strings -Wunsafe-loop-optimizations -Wundef -Wformat=2 -Wlogical-op -Wsign-compare -Wformat-security -Wmissing-include-dirs -Wformat-nonliteral -Wold-style-definition -Wpointer-arith -Winit-self -Wdeclaration-after-statement -Wfloat-equal -Wmissing-prototypes -Wstrict-prototypes -Wredundant-decls -Wmissing-declarations -Wmissing-noreturn -Wshadow -Wendif-labels -Wcast-align -Wstrict-aliasing -Wwrite-strings -Wno-unused-parameter -ffast-math -fno-common -fdiagnostics-show-option -fdiagnostics-color=auto],
     [], [-pedantic -Werror])
 
 AS_CASE([" $CFLAGS "], [*" -O0 "*], [], [

commit ba925a0213fe3e59a5c5cc3ae3c73f8b72cef014
Author: Javier Jardón <jjardon at gnome.org>
Date:   Sat Oct 26 23:26:12 2013 +0100

    build-sys: Use AM_CPPFLAGS instead of AM_CFLAGS for preprocessor arguments
    
    As the automake documentation says:
    
    AM_CPPFLAGS: The contents of this variable are passed to every compilation
        that invokes the C preprocessor; it is a list of arguments to the preprocessor.
        For instance, -I and -D options should be listed here
    
    AM_CFLAGS: This is the variable the Makefile.am author can use to pass in
        additional C compiler flags.
    
    http://www.gnu.org/software/automake/manual/html_node/Program-Variables.html

diff --git a/src/Makefile.am b/src/Makefile.am
index d7ef395..c5fea5d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -46,11 +46,11 @@ AM_CPPFLAGS = \
 	-I$(top_srcdir)/src/modules \
 	-I$(top_builddir)/src/modules \
 	-DPA_ALSA_PATHS_DIR=\"$(alsapathsdir)\" \
-	-DPA_ALSA_PROFILE_SETS_DIR=\"$(alsaprofilesetsdir)\"
-AM_CFLAGS = \
-	$(PTHREAD_CFLAGS) \
+	-DPA_ALSA_PROFILE_SETS_DIR=\"$(alsaprofilesetsdir)\" \
 	-DPA_SRCDIR=\"$(abs_srcdir)\" \
 	-DPA_BUILDDIR=\"$(abs_builddir)\"
+AM_CFLAGS = \
+	$(PTHREAD_CFLAGS)
 AM_CXXFLAGS = $(AM_CFLAGS)
 SERVER_CFLAGS = -D__INCLUDED_FROM_PULSE_AUDIO