retronetworking
/
freeswitch
13
0
Fork 0
Code Pull Requests Releases Activity

FS-7500: fix include paths for libvpx

This commit is contained in:
Mike Jerris 2015-05-19 12:56:33 -05:00 committed by Michael Jerris
parent 79741a307d
commit 387b405ccd
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
configure.ac
View File

@ -294,6 +294,7 @@ fi
# set defaults for use on all platforms
SWITCH_AM_CFLAGS="-I${switch_srcdir}/src/include -I${switch_builddir}/src/include -I${switch_srcdir}/libs/libteletone/src"
SWITCH_AM_CXXFLAGS="-I${switch_srcdir}/src/include -I${switch_builddir}/src/include -I${switch_srcdir}/libs/libteletone/src"
SWITCH_AM_CPPFLAGS="-I${switch_srcdir}/src/include -I${switch_builddir}/src/include -I${switch_srcdir}/libs/libteletone/src"
SWITCH_AM_LDFLAGS="-lm"
#set SOLINK variable based on compiler and host
@ -810,6 +811,7 @@ fi
AC_SUBST(SWITCH_AM_CFLAGS)
AC_SUBST(SWITCH_ANSI_CFLAGS)
AC_SUBST(SWITCH_AM_CXXFLAGS)
AC_SUBST(SWITCH_AM_CPPFLAGS)
AC_SUBST(SWITCH_AM_LDFLAGS)
AC_SUBST(ESL_LDFLAGS)
AC_SUBST(PLATFORM_CORE_LDFLAGS)
@ -1260,6 +1262,7 @@ PKG_CHECK_MODULES([VPX], [vpx2 >= 1.4.0],[
SWITCH_AM_CFLAGS="$VPX_CFLAGS $SWITCH_AM_CFLAGS"
SWITCH_AM_CXXFLAGS="$VPX_CFLAGS $SWITCH_AM_CXXFLAGS"
SWITCH_AM_CPPFLAGS="$VPX_CFLAGS $SWITCH_AM_CPPFLAGS"
PKG_CHECK_MODULES([AVCODEC], [libavcodec >= 53.35.0],[
AM_CONDITIONAL([HAVE_AVCODEC],[true])],[

6
src/mod/languages/mod_perl/Makefile.am
View File

@ -8,15 +8,15 @@ perldir=$(prefix)/perl
mod_LTLIBRARIES = mod_perl.la
perl_LTLIBRARIES = freeswitch.la
mod_perl_la_SOURCES = mod_perl.c freeswitch_perl.cpp mod_perl_wrap.cpp perlxsi.c
mod_perl_la_CFLAGS = $(AM_CFLAGS)
mod_perl_la_CXXFLAGS = $(AM_CXXFLAGS)
mod_perl_la_CFLAGS = $(SWITCH_AM_CFLAGS)
mod_perl_la_CXXFLAGS = $(SWITCH_AM_CXXFLAGS)
mod_perl_la_CPPFLAGS = -w -DMULTIPLICITY `$(PERL) -MExtUtils::Embed -e ccopts` -DEMBED_PERL -I$(switch_srcdir)/libs/libteletone/src/
mod_perl_la_LIBADD = $(switch_builddir)/libfreeswitch.la
mod_perl_la_LDFLAGS = -avoid-version -module -no-undefined -shared `$(PERL) -MExtUtils::Embed -e ldopts` `$(PERL) -MConfig -e 'print $$Config{libs}'`
freeswitch_la_SOURCES = freeswitch_perl.cpp mod_perl_wrap.cpp perlxsi.c
freeswitch_la_LDFLAGS = -avoid-version -module -no-undefined -shared $(LDFLAGS)
freeswitch_la_CPPFLAGS = -w -DMULTIPLICITY `$(PERL) -MExtUtils::Embed -e ccopts` -DEMBED_PERL -I$(switch_srcdir)/libs/libteletone/src/
freeswitch_la_CPPFLAGS = $(SWITCH_AM_CPPFLAGS) -w -DMULTIPLICITY `$(PERL) -MExtUtils::Embed -e ccopts` -DEMBED_PERL -I$(switch_srcdir)/libs/libteletone/src/
reswig: swigclean mod_perl_wrap.cpp
swigclean: clean

4
src/mod/languages/mod_python/Makefile.am
View File

@ -9,8 +9,8 @@ SWIGIFILE=../../../switch_swig.i
mod_LTLIBRARIES = mod_python.la
mod_python_la_SOURCES = mod_python.c freeswitch_python.cpp mod_python_wrap.cpp
mod_python_la_CFLAGS = $(AM_CFLAGS)
mod_python_la_CPPFLAGS = @PYTHON_CFLAGS@ -I$(switch_srcdir)/libs/libteletone/src/
mod_python_la_CFLAGS = $(SWITCH_AM_CFLAGS)
mod_python_la_CPPFLAGS = @PYTHON_CFLAGS@ -I$(switch_srcdir)/libs/libteletone/src/ $(SWITCH_AM_CPPFLAGS)
mod_python_la_LIBADD = $(switch_builddir)/libfreeswitch.la
mod_python_la_LDFLAGS = -avoid-version -module -no-undefined -shared @PYTHON_LDFLAGS@