FS-7519: [mod_avcodec] add x264 to linker

diff --git a/configure.ac b/configure.ac
index 39f8143384aae21d970f8b4b61d3c3832fbb7f9c..8e397c1e86858986939cdd64caaee44a3647de18 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1267,6 +1267,10 @@ PKG_CHECK_MODULES([AVCODEC], [libavcodec >= 53.35.0],[
   AM_CONDITIONAL([HAVE_AVCODEC],[true])],[
   AC_MSG_RESULT([no]); AM_CONDITIONAL([HAVE_AVCODEC],[false])])
 
+PKG_CHECK_MODULES([X264], [x264 >= 0.142.2431],[
+  AM_CONDITIONAL([HAVE_X264],[true])],[
+  AC_MSG_RESULT([no]); AM_CONDITIONAL([HAVE_X264],[false])])
+
 PKG_CHECK_MODULES([AVFORMAT], [libavformat >= 53.21.1],[
   AM_CONDITIONAL([HAVE_AVFORMAT],[true])],[
   AC_MSG_RESULT([no]); AM_CONDITIONAL([HAVE_AVFORMAT],[false])])

diff --git a/src/mod/codecs/mod_avcodec/Makefile.am b/src/mod/codecs/mod_avcodec/Makefile.am
index a024907acbf1b8c6bc22e86b4f976c582d62c0c5..85ee0e651c256fa2bbce16826cb9249ffc41d13f 100644 (file)
--- a/src/mod/codecs/mod_avcodec/Makefile.am
+++ b/src/mod/codecs/mod_avcodec/Makefile.am
@@ -5,8 +5,8 @@ if HAVE_AVCODEC
 
 mod_LTLIBRARIES = mod_avcodec.la
 mod_avcodec_la_SOURCES  = mod_avcodec.c
-mod_avcodec_la_CFLAGS   = $(AM_CFLAGS) $(AVCODEC_CFLAGS) $(AVUTIL_CFLAGS)
-mod_avcodec_la_LIBADD   = $(switch_builddir)/libfreeswitch.la $(AVCODEC_LIBS)  $(AVFORMAT_LIBS) $(AVUTIL_LIBS)
+mod_avcodec_la_CFLAGS   = $(AM_CFLAGS) $(AVCODEC_CFLAGS) $(AVUTIL_CFLAGS) $(X264_CFLAGS)
+mod_avcodec_la_LIBADD   = $(switch_builddir)/libfreeswitch.la $(AVCODEC_LIBS)  $(AVFORMAT_LIBS) $(AVUTIL_LIBS) $(X264_LIBS)
 mod_avcodec_la_LDFLAGS  = -avoid-version -module -no-undefined -shared -lm -lz
 
 else