diff options
| author | brian-ch <brian-ch@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2015-04-03 20:42:27 +0000 |
|---|---|---|
| committer | brian-ch <brian-ch@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2015-04-03 20:42:27 +0000 |
| commit | f80199e9dfde699a8c6c3de5e182f64755805efd (patch) | |
| tree | c8a0030f681840bde74a2144ccfa6311c229de9e /dists | |
| parent | d3fab250e5da9a9d894d5e4d0c78d3d16b86a8f4 (diff) | |
| download | usdx-f80199e9dfde699a8c6c3de5e182f64755805efd.tar.gz usdx-f80199e9dfde699a8c6c3de5e182f64755805efd.tar.xz usdx-f80199e9dfde699a8c6c3de5e182f64755805efd.zip | |
Update configure to detect lua5.3 and ffmpeg 2.6
git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@3113 b956fd51-792f-4845-bead-9b4dfca2ff2c
Diffstat (limited to 'dists')
| -rw-r--r-- | dists/autogen/m4/pkg_config_utils.m4 | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/dists/autogen/m4/pkg_config_utils.m4 b/dists/autogen/m4/pkg_config_utils.m4 index 372649bb..aac6d68c 100644 --- a/dists/autogen/m4/pkg_config_utils.m4 +++ b/dists/autogen/m4/pkg_config_utils.m4 @@ -101,7 +101,9 @@ AC_DEFUN([PKG_VERSION], if test $1 = "libavutil"; then AC_MSG_CHECKING([version of ffmpeg]) if test $[$1][_VERSION_INT] -le 60000000; then - if test $[$1][_VERSION_INT] -ge 54015100; then + if test $[$1][_VERSION_INT] -ge 54020100; then + FFMPEG_VERSION="2.6" + elif test $[$1][_VERSION_INT] -ge 54015100; then FFMPEG_VERSION="2.5" elif test $[$1][_VERSION_INT] -ge 54007001; then FFMPEG_VERSION="2.4" |