FS-7500: require libvpx 1.4

This commit is contained in:
Michael Jerris 2015-05-15 23:42:00 -05:00
parent 8e1dc361e0
commit cc9a225bb9
1 changed files with 4 additions and 9 deletions

View File

@ -1252,16 +1252,11 @@ PKG_CHECK_MODULES([SNDFILE], [sndfile >= 1.0.20],[
AM_CONDITIONAL([HAVE_SNDFILE],[true])],[
AC_MSG_RESULT([no]); AM_CONDITIONAL([HAVE_SNDFILE],[false])])
PKG_CHECK_MODULES([VPX], [vpx >= 1.3.0],[
PKG_CHECK_MODULES([VPX], [vpx2 >= 1.4.0],[
AM_CONDITIONAL([HAVE_VPX],[true])],[
AC_CHECK_LIB([vpx], [vpx_img_set_rect], [VPX_LIBS=-lvpx])
AS_IF([test -z "$VPX_LIBS"],[
if module_enabled mod_vpx; then
AC_MSG_ERROR([You need to either install libvpx-dev or disable mod_vpx in modules.conf])
else
AC_MSG_RESULT([no]); AM_CONDITIONAL([HAVE_VPX],[false])
fi],[
AM_CONDITIONAL([HAVE_VPX],[true])])])
PKG_CHECK_MODULES([VPX], [vpx >= 1.4.0],[
AM_CONDITIONAL([HAVE_VPX],[true])],[
AC_MSG_RESULT([no]); AM_CONDITIONAL([HAVE_VPX],[false])])])
PKG_CHECK_MODULES([AVCODEC], [libavcodec >= 53.35.0],[
AM_CONDITIONAL([HAVE_AVCODEC],[true])],[