summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorUoti Urpala <uau@mplayer2.org>2011-08-21 00:36:23 +0300
committerUoti Urpala <uau@mplayer2.org>2011-08-21 00:36:23 +0300
commit36fcd351f686c3d94c61a6d30d9c723ff9024f33 (patch)
treed09ebf691ee40bb22bdbde4a8756f5f1e1cf0f8b /configure
parentc9c6b878bef0331c4b8f446666d0220585b6e78f (diff)
downloadmpv-36fcd351f686c3d94c61a6d30d9c723ff9024f33.tar.bz2
mpv-36fcd351f686c3d94c61a6d30d9c723ff9024f33.tar.xz
configure: libav: use "pkg-config --print-errors", "Libav" name
Use the "--print-errors" flag of pkg-config when testing for the presence of Libav libraries. Even though the error output is a bit messy (printed on the same "Checking for"... line), it does contain useful information for this test which checks for several libraries at once. Also change the test name from "FFmpeg" to "Libav" and rename the option from --disable-ffmpeg to --disable-libav. The change should cause no compatibility problems as the option is very rarely used.
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure18
1 files changed, 9 insertions, 9 deletions
diff --git a/configure b/configure
index 864bb1ee9b..f1bfb90c41 100755
--- a/configure
+++ b/configure
@@ -362,7 +362,7 @@ Codecs:
--disable-real disable RealPlayer codecs support [enabled]
--disable-xvid disable Xvid [autodetect]
--disable-libnut disable libnut [autodetect]
- --disable-ffmpeg disable FFmpeg [autodetect]
+ --disable-libav disable Libav [autodetect]
--disable-libvorbis disable libvorbis support [autodetect]
--disable-tremor disable Tremor [autodetect if no libvorbis]
--disable-speex disable Speex support [autodetect]
@@ -1033,8 +1033,8 @@ for ac_option do
--disable-xvid) _xvid=no ;;
--enable-libnut) _libnut=yes ;;
--disable-libnut) _libnut=no ;;
- --enable-ffmpeg) ffmpeg=yes ;;
- --disable-ffmpeg) ffmpeg=no ;;
+ --enable-libav) ffmpeg=yes ;;
+ --disable-libav) ffmpeg=no ;;
--ffmpeg-source-dir=*)
_ffmpeg_source=$(echo $ac_option | cut -d '=' -f 2 ) ;;
@@ -6010,13 +6010,13 @@ echores "$_live"
-all_ffmpeg_libs="libavutil libavcodec libavformat libswscale libpostproc"
-echocheck "FFmpeg ($all_ffmpeg_libs)"
+all_libav_libs="libavutil libavcodec libavformat libswscale libpostproc"
+echocheck "Libav ($all_libav_libs)"
if test "$ffmpeg" = auto ; then
ffmpeg=no
- if $_pkg_config --exists $all_ffmpeg_libs ; then
- inc_ffmpeg=$($_pkg_config --cflags $all_ffmpeg_libs)
- _ld_tmp=$($_pkg_config --libs $all_ffmpeg_libs)
+ if $_pkg_config --exists --print-errors $all_libav_libs ; then
+ inc_ffmpeg=$($_pkg_config --cflags $all_libav_libs)
+ _ld_tmp=$($_pkg_config --libs $all_libav_libs)
extra_ldflags="$extra_ldflags $_ld_tmp"
extra_cflags="$extra_cflags $inc_ffmpeg"
ffmpeg=yes
@@ -6024,7 +6024,7 @@ if test "$ffmpeg" = auto ; then
extra_ldflags="$extra_ldflags -lpostproc -lswscale -lavformat -lavcodec -lavutil"
ffmpeg=yes
else
- die "Unable to find development files for some of the FFmpeg libraries above. Aborting. If you really mean to compile without FFmpeg support use --disable-ffmpeg."
+ die "Unable to find development files for some of the Libav libraries above. Aborting. If you really mean to compile without Libav support use --disable-libav."
fi
fi