[MPlayer-cvslog] r36878 - trunk/configure

[reimar]

Author: reimar
Date: Tue Feb 18 00:25:32 2014
New Revision: 36878

Log:
configure: improve FFmpeg check.

If internal FFmpeg is not available we should fall back to
external automatically instead of trying to build without
(which is currently broken it seems).
Also we can compile without internal copy as long as the
necessary headers can be found.
Two are required that FFmpeg does not install:
libavformat/internal.h
libavutil/x86/asm.h

Modified:
   trunk/configure

Modified: trunk/configure
==============================================================================
--- trunk/configure	Mon Feb 17 23:34:27 2014	(r36877)
+++ trunk/configure	Tue Feb 18 00:25:32 2014	(r36878)
@@ -7055,12 +7055,11 @@ echores "$_librtmp"
 
 
 echocheck "FFmpeg"
-test -d ffmpeg/libavutil ||
-  die "MPlayer will not compile without libavutil in the source tree."
 ffmpeg=no
 if test "$ffmpeg_a" = auto ; then
-  test -d ffmpeg/libavutil && ffmpeg_a=yes && ffmpeg=yes
-elif test "$ffmpeg_so" = auto ; then
+  test -d ffmpeg/libavcodec && ffmpeg_a=yes && ffmpeg_so=no && ffmpeg=yes
+fi
+if test "$ffmpeg_so" = auto ; then
   ffmpeg_so=no
   if $_pkg_config --exists libavutil ; then
     inc_ffmpeg=$($_pkg_config --cflags libswscale libavformat libavcodec libavutil)