From: Jaroslav Kysela <perex@perex.cz>
Date: Thu, 16 Oct 2014 07:12:54 +0000 (+0200)
Subject: configure: another improvement in the libav detection, fixes #2382
X-Git-Tag: v4.1~989
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8d71f8ed25f4d29fd9a643e89b72068d7a0b509c;p=thirdparty%2Ftvheadend.git

configure: another improvement in the libav detection, fixes #2382
---

diff --git a/configure b/configure
index e08ce6509..16b6c7a29 100755
--- a/configure
+++ b/configure
@@ -372,13 +372,14 @@ else
 
     if $has_libav; then
       enable libav
-    elif enabled_or_auto libav; then
-
-      die "libav development support not found
-(use --disable-libav or --enable-libffmpeg_static)
-((supported ffmpeg libs n1.2+))
-((supported libav  libs v10+))"
-
+    else
+      echo "WARNING: none or old libav or libffmpeg libraries were detected"
+      echo "         * use --disable-libav or --enable-libffmpeg_static"
+      echo "         ** supported ffmpeg libs n1.2+"
+      echo "         ** supported libav  libs v10+"
+      if enabled libav; then
+        die "libav development support not found"
+      fi
     fi
   fi
 
diff --git a/support/configure.inc b/support/configure.inc
index 2ec83264e..f7cfcd3e4 100755
--- a/support/configure.inc
+++ b/support/configure.inc
@@ -204,12 +204,15 @@ check_pkg ()
 
   printf "$TAB" "checking for pkg $pkg $ver ..."
 
+  dver=$(pkg-config --modversion $pkg 2> /dev/null)
+  test -z "$dver" && dver="<none>"
+
   # Check for package
   if pkg-config $pkg $cver; then
-    echo "ok"
+    echo "ok (detected ${dver})"
     enable_pkg $pkg
   else
-    echo "fail"
+    echo "fail (detected ${dver})"
     return 1
   fi
 }