Author: diego Date: Thu Mar 15 19:07:12 2007 New Revision: 22621 Modified: trunk/configure trunk/libmpdemux/Makefile Log: Add live555 include flags to CXXFLAGS only. patch by Carl Eugen Hoyos, cehoyos ag.or at Modified: trunk/configure ============================================================================== --- trunk/configure (original) +++ trunk/configure Thu Mar 15 19:07:12 2007 @@ -6089,7 +6089,7 @@ EOF $_livelibdir/UsageEnvironment/libUsageEnvironment.a \ $_livelibdir/BasicUsageEnvironment/libBasicUsageEnvironment.a \ $_ld_extra -lstdc++" \ - _inc_extra="$_inc_extra -I$_livelibdir/liveMedia/include \ + _inc_extraxx="-I$_livelibdir/liveMedia/include \ -I$_livelibdir/UsageEnvironment/include \ -I$_livelibdir/BasicUsageEnvironment/include \ -I$_livelibdir/groupsock/include" && \ @@ -7466,6 +7466,7 @@ RANLIB = $_ranlib LDCONFIG = $_ldconfig INSTALL = $_install EXTRA_INC = $_inc_extra +EXTRAXX_INC = $_inc_extraxx OPTFLAGS = $CFLAGS \$(EXTRA_INC) INSTALLSTRIP = $_install_strip CHARSET = $_charset Modified: trunk/libmpdemux/Makefile ============================================================================== --- trunk/libmpdemux/Makefile (original) +++ trunk/libmpdemux/Makefile Thu Mar 15 19:07:12 2007 @@ -71,6 +71,6 @@ CFLAGS-$(CONFIG_LIBAVUTIL) += -I../ CFLAGS-$(CONFIG_LIBAVCODEC) += -I../libavcodec CFLAGS-$(CONFIG_LIBAVFORMAT) += -I../libavformat -CXXFLAGS = $(subst -Wdeclaration-after-statement,,$(CFLAGS)) -D__STDC_LIMIT_MACROS +CXXFLAGS = $(subst -Wdeclaration-after-statement,,$(CFLAGS)) -D__STDC_LIMIT_MACROS $(EXTRAXX_INC) include ../mpcommon.mak