FS-7500: fix include paths for libvpx

diff --git a/configure.ac b/configure.ac
index bf4a80554e87696c4d962eb532a04a3e9144bb1d..33bef510590574a316f8837d005a4672efa03f80 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -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])],[

diff --git a/src/mod/languages/mod_perl/Makefile.am b/src/mod/languages/mod_perl/Makefile.am
index 600cd2e43c6199787da24c18b4410286850043a2..acf1d465a1a15e0bfc998d05c77fd5cdf639a9e9 100644 (file)
--- a/src/mod/languages/mod_perl/Makefile.am
+++ b/src/mod/languages/mod_perl/Makefile.am
@@ -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

diff --git a/src/mod/languages/mod_python/Makefile.am b/src/mod/languages/mod_python/Makefile.am
index a299841526e80e94ff5c1e0f15554254df114d58..64ad6b4f4ebdf64e40c337b68533d833c27135e5 100644 (file)
--- a/src/mod/languages/mod_python/Makefile.am
+++ b/src/mod/languages/mod_python/Makefile.am
@@ -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@