[MPlayer-cvslog] r38100 - trunk/configure

[reimar]

Author: reimar
Date: Wed Apr 18 00:39:30 2018
New Revision: 38100

Log:
configure: fix --enable-ffmpeg_so

It needs to set "$ffmpeg" to yes even though
we run no auto-detection.
Fixes issue #2339.

Modified:
   trunk/configure

Modified: trunk/configure
==============================================================================
--- trunk/configure	Sun Apr 15 13:45:22 2018	(r38099)
+++ trunk/configure	Wed Apr 18 00:39:30 2018	(r38100)
@@ -7211,10 +7211,9 @@ echores "$_librtmp"
 
 
 echocheck "FFmpeg"
-ffmpeg=no
 if test "$ffmpeg_a" = auto ; then
   ffmpeg_a=no
-  test -d ffmpeg/libavcodec && ffmpeg_a=yes && ffmpeg_so=no && ffmpeg=yes
+  test -d ffmpeg/libavcodec && ffmpeg_a=yes && ffmpeg_so=no
 fi
 if test "$ffmpeg_so" = auto ; then
   ffmpeg_so=no
@@ -7227,10 +7226,13 @@ if test "$ffmpeg_so" = auto ; then
   elif header_check libavutil/avutil.h -lswscale -lswresample -lavformat -lavcodec -lavutil ; then
     extra_ldflags="$extra_ldflags -lswscale -lswresample -lavformat -lavcodec -lavutil"
     ffmpeg_so=yes
-    ffmpeg=yes
   fi
 fi
 
+ffmpeg=no
+test "$ffmpeg_a" = yes && ffmpeg=yes
+test "$ffmpeg_so" = yes && ffmpeg=yes
+
 if test "$ffmpeg" = yes; then
   test -e config.h || touch config.h
   def_ffmpeg='#define CONFIG_FFMPEG 1'