FS-7500: fix vpx include paths

diff --git a/Makefile.am b/Makefile.am
index f6672d5fe092e3a0c98b0ee4130963e10a606585..572f7b34272a033916d3e1e0a3ed1ea519f8cf60 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -161,7 +161,7 @@ libfreeswitch_spandsp_la_SOURCES = libs/spandsp/src/plc.c libs/spandsp/src/alloc
 libfreeswitch_spandsp_la_CFLAGS  = -Ilibs/spandsp/src $(CORE_CFLAGS) $(AM_CFLAGS)
 CORE_LIBS+=libfreeswitch_spandsp.la
 lib_LTLIBRARIES                 = libfreeswitch.la
-libfreeswitch_la_CFLAGS  = $(CORE_CFLAGS) $(SQLITE_CFLAGS) $(FREETYPE_CFLAGS) $(CURL_CFLAGS) $(PCRE_CFLAGS) $(SPEEX_CFLAGS) $(LIBEDIT_CFLAGS) $(openssl_CFLAGS) $(AM_CFLAGS)
+libfreeswitch_la_CFLAGS  = $(CORE_CFLAGS) $(SQLITE_CFLAGS) $(FREETYPE_CFLAGS) $(CURL_CFLAGS) $(PCRE_CFLAGS) $(SPEEX_CFLAGS) $(LIBEDIT_CFLAGS) $(openssl_CFLAGS) $(VPX_CFLAGS) $(AM_CFLAGS)
 libfreeswitch_la_LDFLAGS = -version-info 1:0:0 $(AM_LDFLAGS) $(PLATFORM_CORE_LDFLAGS) -no-undefined
 libfreeswitch_la_LIBADD  = $(CORE_LIBS) $(APR_LIBS) $(SQLITE_LIBS) $(FREETYPE_LIBS) $(CURL_LIBS) $(PCRE_LIBS) $(SPEEX_LIBS) $(LIBEDIT_LIBS) $(openssl_LIBS) $(VPX_LIBS) $(PLATFORM_CORE_LIBS)
 libfreeswitch_la_DEPENDENCIES = $(BUILT_SOURCES)

diff --git a/configure.ac b/configure.ac
index 3ec8a745c755eef3b242bf37ba85b117f476d77c..bf4a80554e87696c4d962eb532a04a3e9144bb1d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1258,6 +1258,9 @@ PKG_CHECK_MODULES([VPX], [vpx2 >= 1.4.0],[
       AM_CONDITIONAL([HAVE_VPX],[true])],[
       AC_MSG_RESULT([no]); AM_CONDITIONAL([HAVE_VPX],[false])])])
 
+SWITCH_AM_CFLAGS="$VPX_CFLAGS $SWITCH_AM_CFLAGS"
+SWITCH_AM_CXXFLAGS="$VPX_CFLAGS $SWITCH_AM_CXXFLAGS"
+
 PKG_CHECK_MODULES([AVCODEC], [libavcodec >= 53.35.0],[
   AM_CONDITIONAL([HAVE_AVCODEC],[true])],[
   AC_MSG_RESULT([no]); AM_CONDITIONAL([HAVE_AVCODEC],[false])])

diff --git a/src/mod/codecs/mod_vpx/Makefile.am b/src/mod/codecs/mod_vpx/Makefile.am
index becb0c564129762b3bee70f60ba534a1036b1e20..2544aa2af0e185b313f51ad9bcf558d6a170944d 100644 (file)
--- a/src/mod/codecs/mod_vpx/Makefile.am
+++ b/src/mod/codecs/mod_vpx/Makefile.am
@@ -5,7 +5,8 @@ if HAVE_VPX
 mod_LTLIBRARIES = mod_vpx.la
 mod_vpx_la_SOURCES  = mod_vpx.c
 mod_vpx_la_LIBADD   = $(switch_builddir)/libfreeswitch.la -L/usr/local/lib/
-mod_vpx_la_LDFLAGS  = -lvpx -avoid-version -module -no-undefined -shared
+mod_vpx_la_CFLAGS   = $(VPX_CFLAGS) $(SWITCH_AM_CFLAGS)
+mod_vpx_la_LDFLAGS  = $(VPX_LDFLAGS) -avoid-version -module -no-undefined -shared
 else
 install: error
 all: error