diff --git a/configure.ac b/configure.ac
index ace887bc..b27e5401 100644
--- a/configure.ac
+++ b/configure.ac
@@ -38,11 +38,11 @@ AC_FUNC_MALLOC
 AC_FUNC_REALLOC
 AC_CHECK_FUNCS([dup2 gettimeofday memset mkdir socket strerror])
 
-# Fix chars to unsigned
-CXXFLAGS="$CXXFLAGS -funsigned-char"
+AC_SUBST([global_CFLAGS], [-funsigned-char])
 
 #allow verbose mode compiles
-AC_ARG_ENABLE([verbose], AC_HELP_STRING([--enable-verbose], [Compile with verbose messages]), CXXFLAGS="-DDEBUG=4 $CXXFLAGS")
+AC_ARG_ENABLE([verbose], AC_HELP_STRING([--enable-verbose], [Compile with verbose messages]),
+	AC_DEFINE([DEBUG], [4]))
 
 AC_CONFIG_FILES([Makefile
                  src/converters/Makefile
diff --git a/src/Makefile.am b/src/Makefile.am
index be9d6a23..a09808dd 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -5,7 +5,7 @@ BUILT_SOURCES=server.html.h embed.js.h
 # Do not clean below files, build machines do not have closure installed
 EXTRA_DIST=server.html server.html.h embed.js.h
 
-AM_CPPFLAGS = $(MIST_CFLAGS)
+AM_CPPFLAGS = $(global_CFLAGS) $(MIST_CFLAGS)
 LDADD = $(MIST_LIBS)
 SUBDIRS=converters analysers
 bin_PROGRAMS=MistBuffer MistController MistConnRAW MistConnRTMP MistConnHTTP MistConnHTTPProgressive MistConnHTTPDynamic MistPlayer
diff --git a/src/analysers/Makefile.am b/src/analysers/Makefile.am
index 342282c7..4f31f0e9 100644
--- a/src/analysers/Makefile.am
+++ b/src/analysers/Makefile.am
@@ -1,4 +1,4 @@
-AM_CPPFLAGS = $(MIST_CFLAGS)
+AM_CPPFLAGS = $(global_CFLAGS) $(MIST_CFLAGS)
 LDADD = $(MIST_LIBS)
 bin_PROGRAMS=MistAnalyserRTMP MistAnalyserFLV MistAnalyserDTSC MistAnalyserAMF
 MistAnalyserRTMP_SOURCES=rtmp_analyser.cpp
diff --git a/src/converters/Makefile.am b/src/converters/Makefile.am
index 37553573..2d40ef01 100644
--- a/src/converters/Makefile.am
+++ b/src/converters/Makefile.am
@@ -1,4 +1,4 @@
-AM_CPPFLAGS = $(MIST_CFLAGS)
+AM_CPPFLAGS = $(global_CFLAGS) $(MIST_CFLAGS)
 LDADD = $(MIST_LIBS)
 bin_PROGRAMS=MistDTSC2FLV MistFLV2DTSC MistDTSCFix
 MistDTSC2FLV_SOURCES=dtsc2flv.cpp