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 | |
| 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
| -rwxr-xr-x | configure | 126 | ||||
| -rw-r--r-- | configure.ac | 6 | ||||
| -rw-r--r-- | dists/autogen/m4/pkg_config_utils.m4 | 10 | ||||
| -rw-r--r-- | src/config-darwin.inc | 6 | ||||
| -rw-r--r-- | src/config.inc.in | 6 |
5 files changed, 116 insertions, 38 deletions
@@ -634,7 +634,7 @@ libavcodec_VERSION_RELEASE libavcodec_VERSION_MINOR libavcodec_VERSION_MAJOR libavcodec_VERSION -lua_LIB_NAME +lua_lib_name lua_VERSION_INT lua_VERSION_RELEASE lua_VERSION_MINOR @@ -4524,8 +4524,14 @@ eof if test libpng = "libavutil"; then { $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 51035100; then - if test $libpng_VERSION_INT -ge 51034101; then + if test $libpng_VERSION_INT -le 60000000; then + if test $libpng_VERSION_INT -ge 52013100; then + FFMPEG_VERSION="1.1" + elif test $libpng_VERSION_INT -ge 51073101; then + FFMPEG_VERSION="1.0" + elif test $libpng_VERSION_INT -ge 51054100; then + FFMPEG_VERSION="0.11" + elif test $libpng_VERSION_INT -ge 51034101; then FFMPEG_VERSION="0.10" elif test $libpng_VERSION_INT -ge 51032000; then FFMPEG_VERSION="0.9" @@ -4726,8 +4732,14 @@ eof if test libpng = "libavutil"; then { $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 51035100; then - if test $libpng_VERSION_INT -ge 51034101; then + if test $libpng_VERSION_INT -le 60000000; then + if test $libpng_VERSION_INT -ge 52013100; then + FFMPEG_VERSION="1.1" + elif test $libpng_VERSION_INT -ge 51073101; then + FFMPEG_VERSION="1.0" + elif test $libpng_VERSION_INT -ge 51054100; then + FFMPEG_VERSION="0.11" + elif test $libpng_VERSION_INT -ge 51034101; then FFMPEG_VERSION="0.10" elif test $libpng_VERSION_INT -ge 51032000; then FFMPEG_VERSION="0.9" @@ -5122,8 +5134,14 @@ eof if test lua = "libavutil"; then { $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 51035100; then - if test $lua_VERSION_INT -ge 51034101; then + if test $lua_VERSION_INT -le 60000000; then + if test $lua_VERSION_INT -ge 52013100; then + FFMPEG_VERSION="1.1" + elif test $lua_VERSION_INT -ge 51073101; then + FFMPEG_VERSION="1.0" + elif test $lua_VERSION_INT -ge 51054100; then + FFMPEG_VERSION="0.11" + elif test $lua_VERSION_INT -ge 51034101; then FFMPEG_VERSION="0.10" elif test $lua_VERSION_INT -ge 51032000; then FFMPEG_VERSION="0.9" @@ -5240,7 +5258,7 @@ See the pkg-config man page for more details. fi fi - lua_LIB_NAME="lua5.1" + lua_lib_name="lua5.1" if [ x$lua_HAVE = xyes ]; then if test x$lua_HAVE = xyes; then @@ -5325,8 +5343,14 @@ eof if test lua = "libavutil"; then { $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 51035100; then - if test $lua_VERSION_INT -ge 51034101; then + if test $lua_VERSION_INT -le 60000000; then + if test $lua_VERSION_INT -ge 52013100; then + FFMPEG_VERSION="1.1" + elif test $lua_VERSION_INT -ge 51073101; then + FFMPEG_VERSION="1.0" + elif test $lua_VERSION_INT -ge 51054100; then + FFMPEG_VERSION="0.11" + elif test $lua_VERSION_INT -ge 51034101; then FFMPEG_VERSION="0.10" elif test $lua_VERSION_INT -ge 51032000; then FFMPEG_VERSION="0.9" @@ -5443,7 +5467,7 @@ See the pkg-config man page for more details. fi fi - lua_LIB_NAME="lua" + lua_lib_name="lua" if test x$lua_HAVE = xyes; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking version of lua" >&5 @@ -5527,8 +5551,14 @@ eof if test lua = "libavutil"; then { $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 51035100; then - if test $lua_VERSION_INT -ge 51034101; then + if test $lua_VERSION_INT -le 60000000; then + if test $lua_VERSION_INT -ge 52013100; then + FFMPEG_VERSION="1.1" + elif test $lua_VERSION_INT -ge 51073101; then + FFMPEG_VERSION="1.0" + elif test $lua_VERSION_INT -ge 51054100; then + FFMPEG_VERSION="0.11" + elif test $lua_VERSION_INT -ge 51034101; then FFMPEG_VERSION="0.10" elif test $lua_VERSION_INT -ge 51032000; then FFMPEG_VERSION="0.9" @@ -5739,8 +5769,14 @@ eof if test libavcodec = "libavutil"; then { $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 51035100; then - if test $libavcodec_VERSION_INT -ge 51034101; then + if test $libavcodec_VERSION_INT -le 60000000; then + if test $libavcodec_VERSION_INT -ge 52013100; then + FFMPEG_VERSION="1.1" + elif test $libavcodec_VERSION_INT -ge 51073101; then + FFMPEG_VERSION="1.0" + elif test $libavcodec_VERSION_INT -ge 51054100; then + FFMPEG_VERSION="0.11" + elif test $libavcodec_VERSION_INT -ge 51034101; then FFMPEG_VERSION="0.10" elif test $libavcodec_VERSION_INT -ge 51032000; then FFMPEG_VERSION="0.9" @@ -6060,8 +6096,14 @@ eof if test libavformat = "libavutil"; then { $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 51035100; then - if test $libavformat_VERSION_INT -ge 51034101; then + if test $libavformat_VERSION_INT -le 60000000; then + if test $libavformat_VERSION_INT -ge 52013100; then + FFMPEG_VERSION="1.1" + elif test $libavformat_VERSION_INT -ge 51073101; then + FFMPEG_VERSION="1.0" + elif test $libavformat_VERSION_INT -ge 51054100; then + FFMPEG_VERSION="0.11" + elif test $libavformat_VERSION_INT -ge 51034101; then FFMPEG_VERSION="0.10" elif test $libavformat_VERSION_INT -ge 51032000; then FFMPEG_VERSION="0.9" @@ -6260,8 +6302,14 @@ eof if test libavutil = "libavutil"; then { $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 51035100; then - if test $libavutil_VERSION_INT -ge 51034101; then + if test $libavutil_VERSION_INT -le 60000000; then + if test $libavutil_VERSION_INT -ge 52013100; then + FFMPEG_VERSION="1.1" + elif test $libavutil_VERSION_INT -ge 51073101; then + FFMPEG_VERSION="1.0" + elif test $libavutil_VERSION_INT -ge 51054100; then + FFMPEG_VERSION="0.11" + elif test $libavutil_VERSION_INT -ge 51034101; then FFMPEG_VERSION="0.10" elif test $libavutil_VERSION_INT -ge 51032000; then FFMPEG_VERSION="0.9" @@ -6475,8 +6523,14 @@ eof if test libswscale = "libavutil"; then { $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 51035100; then - if test $libswscale_VERSION_INT -ge 51034101; then + if test $libswscale_VERSION_INT -le 60000000; then + if test $libswscale_VERSION_INT -ge 52013100; then + FFMPEG_VERSION="1.1" + elif test $libswscale_VERSION_INT -ge 51073101; then + FFMPEG_VERSION="1.0" + elif test $libswscale_VERSION_INT -ge 51054100; then + FFMPEG_VERSION="0.11" + elif test $libswscale_VERSION_INT -ge 51034101; then FFMPEG_VERSION="0.10" elif test $libswscale_VERSION_INT -ge 51032000; then FFMPEG_VERSION="0.9" @@ -6686,8 +6740,14 @@ eof if test libprojectM = "libavutil"; then { $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 51035100; then - if test $libprojectM_VERSION_INT -ge 51034101; then + if test $libprojectM_VERSION_INT -le 60000000; then + if test $libprojectM_VERSION_INT -ge 52013100; then + FFMPEG_VERSION="1.1" + elif test $libprojectM_VERSION_INT -ge 51073101; then + FFMPEG_VERSION="1.0" + elif test $libprojectM_VERSION_INT -ge 51054100; then + FFMPEG_VERSION="0.11" + elif test $libprojectM_VERSION_INT -ge 51034101; then FFMPEG_VERSION="0.10" elif test $libprojectM_VERSION_INT -ge 51032000; then FFMPEG_VERSION="0.9" @@ -6972,8 +7032,14 @@ eof if test portaudio = "libavutil"; then { $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 51035100; then - if test $portaudio_VERSION_INT -ge 51034101; then + if test $portaudio_VERSION_INT -le 60000000; then + if test $portaudio_VERSION_INT -ge 52013100; then + FFMPEG_VERSION="1.1" + elif test $portaudio_VERSION_INT -ge 51073101; then + FFMPEG_VERSION="1.0" + elif test $portaudio_VERSION_INT -ge 51054100; then + FFMPEG_VERSION="0.11" + elif test $portaudio_VERSION_INT -ge 51034101; then FFMPEG_VERSION="0.10" elif test $portaudio_VERSION_INT -ge 51032000; then FFMPEG_VERSION="0.9" @@ -7183,8 +7249,14 @@ eof if test libpcre = "libavutil"; then { $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 51035100; then - if test $libpcre_VERSION_INT -ge 51034101; then + if test $libpcre_VERSION_INT -le 60000000; then + if test $libpcre_VERSION_INT -ge 52013100; then + FFMPEG_VERSION="1.1" + elif test $libpcre_VERSION_INT -ge 51073101; then + FFMPEG_VERSION="1.0" + elif test $libpcre_VERSION_INT -ge 51054100; then + FFMPEG_VERSION="0.11" + elif test $libpcre_VERSION_INT -ge 51034101; then FFMPEG_VERSION="0.10" elif test $libpcre_VERSION_INT -ge 51032000; then FFMPEG_VERSION="0.9" diff --git a/configure.ac b/configure.ac index 2c566f53..3e6e40a8 100644 --- a/configure.ac +++ b/configure.ac @@ -183,16 +183,16 @@ if [[ x$lua_HAVE = xyes ]]; then PKG_VERSION([lua], [lua5.2]) else PKG_HAVE([lua], [lua5.1], check) - lua_LIB_NAME="lua5.1" + lua_lib_name="lua5.1" if [[ x$lua_HAVE = xyes ]]; then PKG_VERSION([lua], [lua5.1]) else PKG_HAVE([lua], [lua >= 5.1], yes) - lua_LIB_NAME="lua" + lua_lib_name="lua" PKG_VERSION([lua], [lua]) fi fi -AC_SUBST(lua_LIB_NAME) +AC_SUBST(lua_lib_name) # find FFMpeg # Note: do not use the min/max version parameters with ffmpeg 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" diff --git a/src/config-darwin.inc b/src/config-darwin.inc index 345f0ed9..181eda57 100644 --- a/src/config-darwin.inc +++ b/src/config-darwin.inc @@ -6,8 +6,8 @@ {* Libraries *} {$IF Defined(IncludeConstants)} - lua_lib_name = 'lua'; - LUA_VERSION_INT = '5001004'; + LUA_LIB_NAME = '@lua_LIB_NAME@'; + LUA_VERSION_INT = 5001004; LUA_VERSION_RELEASE = '4'; LUA_VERSION_MINOR = '1'; LUA_VERSION_MAJOR = '5'; @@ -18,7 +18,7 @@ {$IF Defined(HaveFFmpeg)} {$MACRO ON} {$IFNDEF FFMPEG_DIR} - {$IF 8 > 0} + {$IF (8 > 0) or (0 > 0)} {$DEFINE FFMPEG_DIR := 'ffmpeg-0.8'} {$ELSE} {$DEFINE FFMPEG_DIR := 'ffmpeg'} diff --git a/src/config.inc.in b/src/config.inc.in index 073b59b3..954d3416 100644 --- a/src/config.inc.in +++ b/src/config.inc.in @@ -6,8 +6,8 @@ {* Libraries *} {$IF Defined(IncludeConstants)} - lua_lib_name = '@lua_LIB_NAME@'; - LUA_VERSION_INT = '@lua_VERSION_INT@'; + LUA_LIB_NAME = '@lua_LIB_NAME@'; + LUA_VERSION_INT = @lua_VERSION_INT@; LUA_VERSION_RELEASE = '@lua_VERSION_RELEASE@'; LUA_VERSION_MINOR = '@lua_VERSION_MINOR@'; LUA_VERSION_MAJOR = '@lua_VERSION_MAJOR@'; @@ -18,7 +18,7 @@ {$IF Defined(HaveFFmpeg)} {$MACRO ON} {$IFNDEF FFMPEG_DIR} - {$IF @FFMPEG_VERSION_MINOR@ > 0} + {$IF (@FFMPEG_VERSION_MINOR@ > 0) or (@FFMPEG_VERSION_MAJOR@ > 0)} {$DEFINE FFMPEG_DIR := 'ffmpeg-@FFMPEG_VERSION_MAJOR@.@FFMPEG_VERSION_MINOR@'} {$ELSE} {$DEFINE FFMPEG_DIR := 'ffmpeg'} |