From 643beb83b6e7c6285c84d45923140c8d2e9aaa0b Mon Sep 17 00:00:00 2001
From: k-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Fri, 3 May 2013 23:47:45 +0000
Subject: 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
---
 configure | 126 ++++++++++++++++++++++++++++++++++++++++++++++++--------------
 1 file changed, 99 insertions(+), 27 deletions(-)

(limited to 'configure')

diff --git a/configure b/configure
index fab641f7..85d55d4e 100755
--- a/configure
+++ b/configure
@@ -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"
-- 
cgit v1.2.3