Do not prevent user from overriding CXXFLAGS

make CXXFLAGS=-O0 would not work without this.
This commit is contained in:
Peter Wu 2012-08-30 23:27:19 +02:00
parent 25300c48cd
commit 11b85b36b1
4 changed files with 6 additions and 6 deletions

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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