diff options
| author | brian-ch <brian-ch@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2014-07-19 21:26:29 +0000 |
|---|---|---|
| committer | brian-ch <brian-ch@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2014-07-19 21:26:29 +0000 |
| commit | 9d670bc59d8aee9858ba9fdecc383b5b6fd80d42 (patch) | |
| tree | a1da1e5fbb9cafa44004599a960b0d049c4b6050 /configure | |
| parent | 88c7140aa66f3403cbca2b8a3bf97683e091db51 (diff) | |
| download | usdx-9d670bc59d8aee9858ba9fdecc383b5b6fd80d42.tar.gz usdx-9d670bc59d8aee9858ba9fdecc383b5b6fd80d42.tar.xz usdx-9d670bc59d8aee9858ba9fdecc383b5b6fd80d42.zip | |
Update configure
git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@3078 b956fd51-792f-4845-bead-9b4dfca2ff2c
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 49 |
1 files changed, 37 insertions, 12 deletions
@@ -4194,6 +4194,7 @@ fi + if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. @@ -4525,7 +4526,9 @@ eof { $as_echo "$as_me:${as_lineno-$LINENO}: checking version of ffmpeg" >&5 $as_echo_n "checking version of ffmpeg... " >&6; } if test $libpng_VERSION_INT -le 60000000; then - if test $libpng_VERSION_INT -ge 52048100; then + if test $libpng_VERSION_INT -ge 52066100; then + FFMPEG_VERSION="2.2" + elif test $libpng_VERSION_INT -ge 52048100; then FFMPEG_VERSION="2.1" elif test $libpng_VERSION_INT -ge 52038100; then FFMPEG_VERSION="2.0" @@ -4739,7 +4742,9 @@ eof { $as_echo "$as_me:${as_lineno-$LINENO}: checking version of ffmpeg" >&5 $as_echo_n "checking version of ffmpeg... " >&6; } if test $libpng_VERSION_INT -le 60000000; then - if test $libpng_VERSION_INT -ge 52048100; then + if test $libpng_VERSION_INT -ge 52066100; then + FFMPEG_VERSION="2.2" + elif test $libpng_VERSION_INT -ge 52048100; then FFMPEG_VERSION="2.1" elif test $libpng_VERSION_INT -ge 52038100; then FFMPEG_VERSION="2.0" @@ -5147,7 +5152,9 @@ eof { $as_echo "$as_me:${as_lineno-$LINENO}: checking version of ffmpeg" >&5 $as_echo_n "checking version of ffmpeg... " >&6; } if test $lua_VERSION_INT -le 60000000; then - if test $lua_VERSION_INT -ge 52048100; then + if test $lua_VERSION_INT -ge 52066100; then + FFMPEG_VERSION="2.2" + elif test $lua_VERSION_INT -ge 52048100; then FFMPEG_VERSION="2.1" elif test $lua_VERSION_INT -ge 52038100; then FFMPEG_VERSION="2.0" @@ -5362,7 +5369,9 @@ eof { $as_echo "$as_me:${as_lineno-$LINENO}: checking version of ffmpeg" >&5 $as_echo_n "checking version of ffmpeg... " >&6; } if test $lua_VERSION_INT -le 60000000; then - if test $lua_VERSION_INT -ge 52048100; then + if test $lua_VERSION_INT -ge 52066100; then + FFMPEG_VERSION="2.2" + elif test $lua_VERSION_INT -ge 52048100; then FFMPEG_VERSION="2.1" elif test $lua_VERSION_INT -ge 52038100; then FFMPEG_VERSION="2.0" @@ -5576,7 +5585,9 @@ eof { $as_echo "$as_me:${as_lineno-$LINENO}: checking version of ffmpeg" >&5 $as_echo_n "checking version of ffmpeg... " >&6; } if test $lua_VERSION_INT -le 60000000; then - if test $lua_VERSION_INT -ge 52048100; then + if test $lua_VERSION_INT -ge 52066100; then + FFMPEG_VERSION="2.2" + elif test $lua_VERSION_INT -ge 52048100; then FFMPEG_VERSION="2.1" elif test $lua_VERSION_INT -ge 52038100; then FFMPEG_VERSION="2.0" @@ -5867,7 +5878,9 @@ eof { $as_echo "$as_me:${as_lineno-$LINENO}: checking version of ffmpeg" >&5 $as_echo_n "checking version of ffmpeg... " >&6; } if test $libavcodec_VERSION_INT -le 60000000; then - if test $libavcodec_VERSION_INT -ge 52048100; then + if test $libavcodec_VERSION_INT -ge 52066100; then + FFMPEG_VERSION="2.2" + elif test $libavcodec_VERSION_INT -ge 52048100; then FFMPEG_VERSION="2.1" elif test $libavcodec_VERSION_INT -ge 52038100; then FFMPEG_VERSION="2.0" @@ -6200,7 +6213,9 @@ eof { $as_echo "$as_me:${as_lineno-$LINENO}: checking version of ffmpeg" >&5 $as_echo_n "checking version of ffmpeg... " >&6; } if test $libavformat_VERSION_INT -le 60000000; then - if test $libavformat_VERSION_INT -ge 52048100; then + if test $libavformat_VERSION_INT -ge 52066100; then + FFMPEG_VERSION="2.2" + elif test $libavformat_VERSION_INT -ge 52048100; then FFMPEG_VERSION="2.1" elif test $libavformat_VERSION_INT -ge 52038100; then FFMPEG_VERSION="2.0" @@ -6412,7 +6427,9 @@ eof { $as_echo "$as_me:${as_lineno-$LINENO}: checking version of ffmpeg" >&5 $as_echo_n "checking version of ffmpeg... " >&6; } if test $libavutil_VERSION_INT -le 60000000; then - if test $libavutil_VERSION_INT -ge 52048100; then + if test $libavutil_VERSION_INT -ge 52066100; then + FFMPEG_VERSION="2.2" + elif test $libavutil_VERSION_INT -ge 52048100; then FFMPEG_VERSION="2.1" elif test $libavutil_VERSION_INT -ge 52038100; then FFMPEG_VERSION="2.0" @@ -6639,7 +6656,9 @@ eof { $as_echo "$as_me:${as_lineno-$LINENO}: checking version of ffmpeg" >&5 $as_echo_n "checking version of ffmpeg... " >&6; } if test $libswscale_VERSION_INT -le 60000000; then - if test $libswscale_VERSION_INT -ge 52048100; then + if test $libswscale_VERSION_INT -ge 52066100; then + FFMPEG_VERSION="2.2" + elif test $libswscale_VERSION_INT -ge 52048100; then FFMPEG_VERSION="2.1" elif test $libswscale_VERSION_INT -ge 52038100; then FFMPEG_VERSION="2.0" @@ -6862,7 +6881,9 @@ eof { $as_echo "$as_me:${as_lineno-$LINENO}: checking version of ffmpeg" >&5 $as_echo_n "checking version of ffmpeg... " >&6; } if test $libprojectM_VERSION_INT -le 60000000; then - if test $libprojectM_VERSION_INT -ge 52048100; then + if test $libprojectM_VERSION_INT -ge 52066100; then + FFMPEG_VERSION="2.2" + elif test $libprojectM_VERSION_INT -ge 52048100; then FFMPEG_VERSION="2.1" elif test $libprojectM_VERSION_INT -ge 52038100; then FFMPEG_VERSION="2.0" @@ -7160,7 +7181,9 @@ eof { $as_echo "$as_me:${as_lineno-$LINENO}: checking version of ffmpeg" >&5 $as_echo_n "checking version of ffmpeg... " >&6; } if test $portaudio_VERSION_INT -le 60000000; then - if test $portaudio_VERSION_INT -ge 52048100; then + if test $portaudio_VERSION_INT -ge 52066100; then + FFMPEG_VERSION="2.2" + elif test $portaudio_VERSION_INT -ge 52048100; then FFMPEG_VERSION="2.1" elif test $portaudio_VERSION_INT -ge 52038100; then FFMPEG_VERSION="2.0" @@ -7383,7 +7406,9 @@ eof { $as_echo "$as_me:${as_lineno-$LINENO}: checking version of ffmpeg" >&5 $as_echo_n "checking version of ffmpeg... " >&6; } if test $libpcre_VERSION_INT -le 60000000; then - if test $libpcre_VERSION_INT -ge 52048100; then + if test $libpcre_VERSION_INT -ge 52066100; then + FFMPEG_VERSION="2.2" + elif test $libpcre_VERSION_INT -ge 52048100; then FFMPEG_VERSION="2.1" elif test $libpcre_VERSION_INT -ge 52038100; then FFMPEG_VERSION="2.0" |