diff options
| author | k-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2013-05-03 23:47:45 +0000 |
|---|---|---|
| committer | k-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2013-05-03 23:47:45 +0000 |
| commit | 643beb83b6e7c6285c84d45923140c8d2e9aaa0b (patch) | |
| tree | 8a5634a195a0bf2bc9550f19be813f67113d1f92 /dists | |
| parent | aa8a156700ed922b3b8188b7abd9deb2f49fa22b (diff) | |
| download | usdx-643beb83b6e7c6285c84d45923140c8d2e9aaa0b.tar.gz usdx-643beb83b6e7c6285c84d45923140c8d2e9aaa0b.tar.xz usdx-643beb83b6e7c6285c84d45923140c8d2e9aaa0b.zip | |
extend the detection of ffmpeg and lua.
git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2979 b956fd51-792f-4845-bead-9b4dfca2ff2c
Diffstat (limited to 'dists')
| -rw-r--r-- | dists/autogen/m4/pkg_config_utils.m4 | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/dists/autogen/m4/pkg_config_utils.m4 b/dists/autogen/m4/pkg_config_utils.m4 index df0b2e49..d5585dc9 100644 --- a/dists/autogen/m4/pkg_config_utils.m4 +++ b/dists/autogen/m4/pkg_config_utils.m4 @@ -100,8 +100,14 @@ AC_DEFUN([PKG_VERSION], # for avutil: map library version to ffmpeg version if test $1 = "libavutil"; then AC_MSG_CHECKING([version of ffmpeg]) - if test $[$1][_VERSION_INT] -le 51035100; then - if test $[$1][_VERSION_INT] -ge 51034101; then + if test $[$1][_VERSION_INT] -le 60000000; then + if test $[$1][_VERSION_INT] -ge 52013100; then + FFMPEG_VERSION="1.1" + elif test $[$1][_VERSION_INT] -ge 51073101; then + FFMPEG_VERSION="1.0" + elif test $[$1][_VERSION_INT] -ge 51054100; then + FFMPEG_VERSION="0.11" + elif test $[$1][_VERSION_INT] -ge 51034101; then FFMPEG_VERSION="0.10" elif test $[$1][_VERSION_INT] -ge 51032000; then FFMPEG_VERSION="0.9" |