Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
configure: another improvement in the libav detection, fixes #2382
  • Loading branch information
perexg committed Oct 16, 2014
1 parent e180b8d commit 8d71f8e
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 9 deletions.
15 changes: 8 additions & 7 deletions configure
Expand Up @@ -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

Expand Down
7 changes: 5 additions & 2 deletions support/configure.inc
Expand Up @@ -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
}
Expand Down

0 comments on commit 8d71f8e

Please sign in to comment.